From 7ebbce535c774806b3db0bedd2ba3cfb95c07658 Mon Sep 17 00:00:00 2001 From: Manorit Chawdhry Date: Mon, 25 Sep 2023 11:53:42 +0530 Subject: [PATCH] env: ti: ti_common.env: Fix get_overlaystring for FIT Image After the refactor with conf- nodes in fitImage, overlaystring wasn't didn't handle the new conf- nodes in FIT Booting. Fix get_overlaystring to handle conf- nodes. Fixes: 837833a724b7 ("environment: ti: Add get_fit_config command to get FIT config string") Reported-by: Aniket Limaye Signed-off-by: Manorit Chawdhry Reviewed-by: Andrew Davis --- include/env/ti/ti_armv7_common.env | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/env/ti/ti_armv7_common.env b/include/env/ti/ti_armv7_common.env index e87a41a..f5d8421 100644 --- a/include/env/ti/ti_armv7_common.env +++ b/include/env/ti/ti_armv7_common.env @@ -15,10 +15,10 @@ boot_fit=0 addr_fit=0x90000000 name_fit=fitImage update_to_fit=setenv loadaddr ${addr_fit}; setenv bootfile ${name_fit} -get_overlaystring= - for overlay in $name_overlays; - do; - setenv overlaystring ${overlaystring}'#'${overlay}; +get_fit_overlaystring= + for overlay in $name_overlays; do; + setexpr name_fit_overlay gsub / _ conf-${overlay}; + setenv overlaystring ${overlaystring}'#'${name_fit_overlay}; done; get_fit_config=setexpr name_fit_config gsub / _ conf-${fdtfile} run_fit=run get_fit_config; bootm ${addr_fit}#${name_fit_config}${overlaystring} @@ -28,7 +28,7 @@ bootcmd_ti_mmc= run main_cpsw0_qsgmii_phyinit; run boot_rprocs; #endif if test ${boot_fit} -eq 1; - then run get_fit_${boot}; run get_overlaystring; run run_fit; + then run get_fit_${boot}; run get_fit_overlaystring; run run_fit; else; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern; fi; -- 2.7.4