From f24c3bdc3cd445bc8d743592fd6931aaad9406c9 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Thu, 8 Sep 2022 20:19:19 +0200 Subject: [PATCH] rpi-base.inc: Split IMAGE_BOOT_FILES for kernel image The kernel image deployment is now defined in IMAGE_BOOT_FILES as a separate variable: RPI_EXTRA_IMAGE_BOOT_FILES. This allows a custom kernel image deployment by redefining this variable when needed. Signed-off-by: Andrei Gherzan --- conf/machine/include/rpi-base.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc index beb1f08..313c7d9 100644 --- a/conf/machine/include/rpi-base.inc +++ b/conf/machine/include/rpi-base.inc @@ -134,12 +134,15 @@ def make_dtb_boot_files(d): return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb]) +RPI_EXTRA_IMAGE_BOOT_FILES ?= " \ + ${@bb.utils.contains('RPI_USE_U_BOOT', '1', \ + '${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \ + '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \ + " IMAGE_BOOT_FILES ?= "${BOOTFILES_DIR_NAME}/* \ ${@make_dtb_boot_files(d)} \ - ${@bb.utils.contains('RPI_USE_U_BOOT', '1', \ - '${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \ - '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \ + ${RPI_EXTRA_IMAGE_BOOT_FILES} \ " do_image_wic[depends] += " \ rpi-bootfiles:do_deploy \