summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Schenker <philippe.schenker@toradex.com>2021-12-29 18:02:20 +0100
committerPhilippe Schenker <philippe.schenker@toradex.com>2021-12-29 18:02:20 +0100
commit81820d92f0c775055da38c12d29e24de81a89ef2 (patch)
tree70737f21fc65bc3b93736e33bf704f4943f1e349
parent2f6a4e41f66496b6719e9b493207b99b9446c837 (diff)
u-boot-distro-boot: fix bug if overlays.txt missing
Without this commit it could happen, that U-Boot falls into strange behavior when overlays.txt is missing. This commit fixes this behavior with only executing "env import" if the previous load command returned success. Related-to: ELB-4246 Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
-rw-r--r--recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in2
1 files changed, 1 insertions, 1 deletions
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 ec765b0..5e7c77f 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
@@ -89,7 +89,7 @@ fi
# Set dynamic commands
env set set_bootcmd_kernel 'env set bootcmd_kernel "${load_cmd} \\${kernel_addr_load} \\${kernel_image}"'
-env set set_load_overlays_file 'env set load_overlays_file "${load_cmd} \\${loadaddr} \\${overlays_file}; env import -t \\${loadaddr} \\${filesize}"'
+env set set_load_overlays_file 'env set load_overlays_file "${load_cmd} \\${loadaddr} \\${overlays_file} && env import -t \\${loadaddr} \\${filesize}"'
if test ${kernel_image} = "fitImage"
then
env set fdt_high