From 23ade8864c7d81adf4d8caf6f77f93bf7ae64167 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 6 Jul 2023 10:18:25 +0200 Subject: image_type_tezi: : follow change to vendor subdir for dtbs With moving to kernel 6.5 the kernel commit 724ba67515320 ("ARM: dts: Move .dts files to vendor sub-directories") introduced a regression with our 32 bit machines. Use 'make_dtb_boot_files' to get the basenames of the dtb list also for NAND based modules. Related-to: ELB-5263 Signed-off-by: Max Krummenacher --- classes/image_type_tezi.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index 4366a40..d3acffc 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -5,9 +5,10 @@ # Since it also generates the image.json description file it is rather # interwind with the boot flow which is U-Boot target specific. +KERNEL_DEVICETREE_BASENAME = "${@make_dtb_boot_files(d)}" WKS_FILE_DEPENDS:append = " tezi-metadata virtual/dtb" DEPENDS += "${WKS_FILE_DEPENDS}" -IMAGE_BOOT_FILES_REMOVE = "${@make_dtb_boot_files(d) if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else ''}" +IMAGE_BOOT_FILES_REMOVE = "${KERNEL_DEVICETREE_BASENAME} if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else ''}" IMAGE_BOOT_FILES:append = " overlays.txt ${@'' if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else 'overlays/*;overlays/'}" IMAGE_BOOT_FILES:remove = "${IMAGE_BOOT_FILES_REMOVE}" @@ -364,7 +365,7 @@ python rootfs_tezi_run_json() { flash_data = rootfs_tezi_rawnand(d) uenv_file = d.getVar('UBOOT_ENV_TEZI_RAWNAND') uboot_file = d.getVar('UBOOT_BINARY_TEZI_RAWNAND') - artifacts += " " + d.getVar('KERNEL_IMAGETYPE') + " " + d.getVar('KERNEL_DEVICETREE') + artifacts += " " + d.getVar('KERNEL_IMAGETYPE') + " " + d.getVar('KERNEL_DEVICETREE_BASENAME') elif flash_type == "emmc": use_bootfiles = oe.types.boolean(d.getVar('TEZI_USE_BOOTFILES')) flash_data = rootfs_tezi_emmc(d, use_bootfiles) -- cgit v1.2.3