From 94f69ea2545354e2294baecc6c9d54cc89fde97a Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Mon, 15 Jun 2020 11:21:10 +0300 Subject: boot.cmd: clean up the variable on "for" loop In some situation "for" loop don't alterate the non-empty iteration variable [1]. Clean up the iteration var at the end of each loop. [1] ------------------ Apalis iMX6 # load ${devtype} ${devnum}:${distro_bootpart} ${loadaddr} ${overlays_file}; env import -t ${loadaddr} ${filesize} 107 bytes read in 11 ms (8.8 KiB/s) Apalis iMX6 # print fdt_overlays fdt_overlays="devicetree/apalis-imx6_parallel-rgb_overlay.dtbo devicetree/apalis-imx6_ov5640_overlay.dtbo" Apalis iMX6 # for overlay_file in ${fdt_overlays}; do echo "file=${overlay_file}"; done file=devicetree/apalis-imx6_parallel-rgb_overlay.dtbo file=devicetree/apalis-imx6_parallel-rgb_overlay.dtbo {Add clean up} Apalis iMX6 # for overlay_file in ${fdt_overlays}; do echo "file=${overlay_file}"; setenv overlay_file; done file=devicetree/apalis-imx6_parallel-rgb_overlay.dtbo file=devicetree/apalis-imx6_ov5640_overlay.dtbo" ------------------ Related-to: ELB-2797 Signed-off-by: Oleksandr Suvorov --- recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in b/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in index 952f58a..db4d317 100644 --- a/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in +++ b/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in @@ -22,7 +22,7 @@ test -n ${kernel_image} || env set kernel_image ${boot_file} env set overlays_file "overlays.txt" env set load_overlay 'load ${devtype} ${devnum}:${distro_bootpart} ${loadaddr} ${overlays_file}; env import -t ${loadaddr} ${filesize}' -env set apply_overlays 'fdt addr ${fdt_addr_r} && fdt resize 0x20000 && for overlay_file in ${fdt_overlays}; do echo "Applying Overlay: ${overlay_file}" && load ${devtype} ${devnum}:${distro_bootpart} ${loadaddr} ${overlay_file} && fdt apply ${loadaddr}; done;' +env set apply_overlays 'fdt addr ${fdt_addr_r} && fdt resize 0x20000 && for overlay_file in ${fdt_overlays}; do echo "Applying Overlay: ${overlay_file}" && load ${devtype} ${devnum}:${distro_bootpart} ${loadaddr} ${overlay_file} && fdt apply ${loadaddr}; env set overlay_file; done;' env set uuid_set 'part uuid ${devtype} ${devnum}:2 uuid' env set emmcargs_set 'env set emmcargs root=PARTUUID=${uuid} ro rootfstype=ext4 rootwait' env set bootcmd_args 'env set bootargs ${defargs} ${emmcargs} ${setupargs} ${vidargs} ${tdxargs}' -- cgit v1.2.3