From c4bd1adef88e337f37cf3c88d53a7d61d3a4441b Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Wed, 24 Mar 2021 13:27:52 +0100 Subject: u-boot-distro-boot: explicitly use bootm for booting fitImage We cant use a single KERNEL_BOOTCMD for both fit/non-fit kernel images, that makes a invalid bootcmd being used in boot.scr either for fit or for non-fit image. Let's change to explicitly use 'bootm' for booting fitimage. Related-to: TOR-1700 Signed-off-by: Ming Liu --- recipes-bsp/u-boot/u-boot-distro-boot.bb | 4 ++-- recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes-bsp') diff --git a/recipes-bsp/u-boot/u-boot-distro-boot.bb b/recipes-bsp/u-boot/u-boot-distro-boot.bb index 97fa88f..596d6df 100644 --- a/recipes-bsp/u-boot/u-boot-distro-boot.bb +++ b/recipes-bsp/u-boot/u-boot-distro-boot.bb @@ -9,8 +9,8 @@ SRC_URI = " \ file://boot.cmd.in \ " -KERNEL_BOOTCMD ??= "${@'bootm' if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else 'bootz'}" -KERNEL_BOOTCMD_aarch64 ?= "${@'bootm' if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else 'booti'}" +KERNEL_BOOTCMD ??= "bootz" +KERNEL_BOOTCMD_aarch64 ?= "booti" inherit deploy 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 b3e15a5..68a9d1a 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 @@ -96,7 +96,7 @@ then 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}" && @@KERNEL_BOOTCMD@@ ${ramdisk_addr_r}#conf@\${fdtfile}\${fitconf_fdt_overlays}' + 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}"' -- cgit v1.2.3