From 13074f2aba6d2e50bc5af332e87633be76249579 Mon Sep 17 00:00:00 2001 From: Philippe Schenker Date: Wed, 29 Dec 2021 18:02:20 +0100 Subject: 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 (cherry picked from commit 81820d92f0c775055da38c12d29e24de81a89ef2) --- 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 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 -- cgit v1.2.3