[PATCH v3] env: ti: ti_common.env: Fix get_overlaystring for FIT Image

Manorit Chawdhry m-chawdhry at ti.com
Mon Sep 25 08:23:42 CEST 2023


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 <a-limaye at ti.com>
Signed-off-by: Manorit Chawdhry <m-chawdhry at ti.com>
---
Test Logs:
=> setenv name_overlays ti/k3-dt.dtbo ti/k3-dt1.dtbo
=> run get_overlaystring
=> printenv overlaystring
overlaystring=#conf-ti_k3-dt.dtbo#conf-ti_k3-dt1.dtbo
---
Changes in v3:
- Refactor to remove dependency on boot_fit ( Andrew )
- Rename it to get_fit_overlaystring as it is not used anywhere else
- Link to v2: https://lore.kernel.org/r/20230921-b4-upstream-overlaystring-v2-1-22e0b71e3334@ti.com
---
 include/env/ti/ti_common.env | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/env/ti/ti_common.env b/include/env/ti/ti_common.env
index e87a41a6590b..f5d84216e3ce 100644
--- a/include/env/ti/ti_common.env
+++ b/include/env/ti/ti_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;

---
base-commit: 2fe4b54556ea6271237b35de68dc458bfceab94c
change-id: 20230915-b4-upstream-overlaystring-207e28b8c5fb

Best regards,
-- 
Manorit Chawdhry <m-chawdhry at ti.com>



More information about the U-Boot mailing list