rpi-base: wic: generate entries for u-boot
PATCH 1/1 rpi-base: wic: generate entries for u-boot
This commit allow wic generated images to work when we want u-boot to load the kernel image.
Augment IMAGE_BOOT_FILES with the proper entries when KERNEL_IMAGETYPE is "uImage". More specifically add u-boot image and boot.scr to deployed files and give the proper name to the kernel image accordingly.
--- conf/machine/include/rpi-base.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
conf/machine/include/rpi-base.inc +3 -1
@@ -83,7 +83,9 @@ def make_dtb_boot_files(d): IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* \ ${@make_dtb_boot_files(d)} \ - ${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE} \ + ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', '${KERNEL_IMAGETYPE}', '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \ + ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', 'u-boot.bin;${SDIMG_KERNELIMAGE}', '', d)} \ + ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', 'boot.scr;boot.scr', '', d)} \ " # The kernel image is installed into the FAT32 boot partition and does not need
Signature · 1 line
2.7.4
Andrei Gherzan
AppliedQuoted 31 lines · Andrea Galbusera
This commit allow wic generated images to work when we want u-boot to load the kernel image.
Augment
IMAGE_BOOT_FILESwith the proper entries whenKERNEL_IMAGETYPEis "uImage". More specifically add u-boot image and boot.scr to deployed files
and give the proper name to the kernel image accordingly.Signed-off-by Andrea Galbusera <[email protected]>--- conf/machine/include/rpi-base.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)conf/machine/include/rpi- renamed from conf/machine/include/rpi-base.inc +0
-0base.inc
index 4a0ea2a..71bb071 100644conf/machine/include/rpi-base.inc +3
-1@@ -83,7 +83,9 @@ def make_dtb_boot_files(d): IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* \ ${@make_dtb_boot_files(d)} \ - ${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE} \ + ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', '${KERNEL_IMAGETYPE}', '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \ + ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', 'u-boot.bin;${SDIMG_KERNELIMAGE}', '', d)} \ + ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', 'boot.scr;boot.scr', '', d)} \"
Quoted 3 lines
# The kernel image is installed into the FAT32 boot partition and does
not need
Merged to master. Thanks.
--
Andrei Gherzan