summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMing Liu <ming.liu@toradex.com>2021-12-05 11:58:06 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2022-02-21 15:10:59 +0100
commit2937773bb0534c81de15cb64487d7652f051d267 (patch)
tree1305852055d03c7624b9c495d59f136f48472007
parent13074f2aba6d2e50bc5af332e87633be76249579 (diff)
u-boot-distro-boot:boot.cmd.in: replace '@' to '-'
The separator of fitImage's config section has been changed from '@' to '-', let's adapt to that, or else fitImage could not boot. Related-to: TOR-1700 Signed-off-by: Ming Liu <ming.liu@toradex.com> (cherry picked from commit 127bb3208b41ede504b992504964c9ad9cc0619f)
-rw-r--r--recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in4
1 files changed, 2 insertions, 2 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 5e7c77f..c667d49 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
@@ -95,8 +95,8 @@ then
env set fdt_high
env set fdt_resize true
env set set_bootcmd_dtb 'env set bootcmd_dtb "true"'
- env set set_apply_overlays 'env set apply_overlays "for overlay_file in \"\\${fdt_overlays}\"; do env set fitconf_fdt_overlays \"\\"\\${fitconf_fdt_overlays}#conf@\\${overlay_file}\\"\"; env set overlay_file; done; true"'
- env set bootcmd_boot 'echo "Bootargs: \${bootargs}" && bootm ${ramdisk_addr_r}#conf@\${fdtfile}\${fitconf_fdt_overlays}'
+ env set set_apply_overlays 'env set apply_overlays "for overlay_file in \"\\${fdt_overlays}\"; do env set fitconf_fdt_overlays \"\\"\\${fitconf_fdt_overlays}#conf-\\${overlay_file}\\"\"; env set overlay_file; done; true"'
+ env set bootcmd_boot 'echo "Bootargs: \${bootargs}" && bootm ${ramdisk_addr_r}#conf-\${fdtfile}\${fitconf_fdt_overlays}'
else
env set fdt_resize 'fdt addr ${fdt_addr_r} && fdt resize 0x20000'
env set set_bootcmd_dtb 'env set bootcmd_dtb "echo Loading DeviceTree: \\${fdtfile}; ${load_cmd} \\${fdt_addr_r} \\${fdtfile}"'