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 <a-limaye@ti.com>
Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
Reviewed-by: Andrew Davis <afd@ti.com>

diff --git a/include/env/ti/ti_armv7_common.env b/include/env/ti/ti_armv7_common.env
index e87a41a..f5d8421 100644 (file)
--- 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;