summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <pbarker@toganlabs.com>2017-09-08 09:58:38 +0000
committerAndrei Gherzan <andrei@gherzan.com>2017-09-24 20:39:35 +0100
commit43e0169ab7f5143fab3ec12a788557a6306c8476 (patch)
treed64f198d6d433faf64c76a43736fad6d090226a4
parent129107837da7251496cab5de379611c72231eb79 (diff)
downloadmeta-raspberrypi-43e0169ab7f5143fab3ec12a788557a6306c8476.tar.gz
rpi-base.inc: Simplify setting of IMAGE_BOOT_FILES
Signed-off-by: Paul Barker <pbarker@toganlabs.com>
-rw-r--r--conf/machine/include/rpi-base.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
index 71bb071..f29db29 100644
--- a/conf/machine/include/rpi-base.inc
+++ b/conf/machine/include/rpi-base.inc
@@ -83,9 +83,9 @@ def make_dtb_boot_files(d):
83 83
84IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* \ 84IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* \
85 ${@make_dtb_boot_files(d)} \ 85 ${@make_dtb_boot_files(d)} \
86 ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', '${KERNEL_IMAGETYPE}', '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \ 86 ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', \
87 ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', 'u-boot.bin;${SDIMG_KERNELIMAGE}', '', d)} \ 87 '${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \
88 ${@bb.utils.contains('KERNEL_IMAGETYPE', 'uImage', 'boot.scr;boot.scr', '', d)} \ 88 '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \
89 " 89 "
90 90
91# 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