[meta-swupdate-boards,2/2] rpi-uboot-scr: sync with upstream

Message ID 1510674519-233-3-git-send-email-mirza.krak@endian.se
State Accepted
Headers show
Series
  • fixes for raspberrypi3
Related show

Commit Message

Mirza Krak Nov. 14, 2017, 3:48 p.m.
The boot.cmd.in supports multiple kernel image formats in
meta-raspberrypi and it was introduced in
43e0169 ("rpi-base.inc: Simplify setting of IMAGE_BOOT_FILES").

Updated accordingly.

Signed-off-by: Mirza Krak <mirza.krak@endian.se>
---
 recipes-bsp/rpi-uboot-scr/files/boot.cmd.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in b/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in
index 71c8c3e..a2986ac 100644
--- a/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in
+++ b/recipes-bsp/rpi-uboot-scr/files/boot.cmd.in
@@ -1,5 +1,5 @@ 
 saveenv
 fdt addr ${fdt_addr} && fdt get value bootargs /chosen bootargs
-fatload mmc 0:1 ${kernel_addr_r} uImage;
+fatload mmc 0:1 ${kernel_addr_r} @@KERNEL_IMAGETYPE@@
 if env exists rpipart;then setenv bootargs ${bootargs} root=/dev/mmcblk0p${rpipart}; fi
-bootm ${kernel_addr_r} - ${fdt_addr}
+@@KERNEL_BOOTCMD@@ ${kernel_addr_r} - ${fdt_addr}