diff options
| author | Andrea Galbusera <gizero@gmail.com> | 2017-06-29 15:56:12 +0200 |
|---|---|---|
| committer | Andrei Gherzan <andrei@gherzan.com> | 2017-06-30 11:46:21 +0100 |
| commit | 04a33eadfbc14d0d7bbcc38c5225395be9938fbe (patch) | |
| tree | 489be80ce4d0725ed180630316aacd5314c0bb8e | |
| parent | fc17cd74191e248386d4874a5a7afc1de49e9922 (diff) | |
| download | meta-raspberrypi-04a33eadfbc14d0d7bbcc38c5225395be9938fbe.tar.gz | |
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.
Signed-off-by: Andrea Galbusera <gizero@gmail.com>
| -rw-r--r-- | conf/machine/include/rpi-base.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc index 4a0ea2a..71bb071 100644 --- a/conf/machine/include/rpi-base.inc +++ b/conf/machine/include/rpi-base.inc | |||
| @@ -83,7 +83,9 @@ def make_dtb_boot_files(d): | |||
| 83 | 83 | ||
| 84 | IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* \ | 84 | IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* \ |
| 85 | ${@make_dtb_boot_files(d)} \ | 85 | ${@make_dtb_boot_files(d)} \ |
| 86 | ${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE} \ | 86 | ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', '${KERNEL_IMAGETYPE}', '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \ |
| 87 | ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', 'u-boot.bin;${SDIMG_KERNELIMAGE}', '', d)} \ | ||
| 88 | ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', 'boot.scr;boot.scr', '', d)} \ | ||
| 87 | " | 89 | " |
| 88 | 90 | ||
| 89 | # The kernel image is installed into the FAT32 boot partition and does not need | 91 | # The kernel image is installed into the FAT32 boot partition and does not need |