From 13f8046d31f2d184a682e91d94a866a0b13394f9 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 21 Oct 2025 17:54:37 +0200 Subject: [PATCH] meta-digi: clean vfat images dependencies vfat images need U-Boot scripts, which are always provided by the U-Boot recipe, even for imx-boot-based machines. Replace the machine-dependent BOOTLOADER_IMAGE_RECIPE with virtual/bootloader (which is provided by u-boot recipes). https://onedigi.atlassian.net/browse/DEL-9768 Signed-off-by: Javier Viguera --- meta-digi-arm/classes/image_types_digi.bbclass | 8 +++----- meta-digi-arm/conf/machine/include/ccimx8m.inc | 1 - meta-digi-arm/conf/machine/include/ccimx8x.inc | 1 - meta-digi-arm/conf/machine/include/ccimx9.inc | 1 - meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc | 2 -- 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/meta-digi-arm/classes/image_types_digi.bbclass b/meta-digi-arm/classes/image_types_digi.bbclass index c3f84a25f..59b1e3029 100644 --- a/meta-digi-arm/classes/image_types_digi.bbclass +++ b/meta-digi-arm/classes/image_types_digi.bbclass @@ -3,8 +3,6 @@ inherit image_types ################################################################################ # BOOT IMAGES # ################################################################################ -BOOTLOADER_IMAGE_RECIPE ?= "u-boot" - # Boot partition size in KiB, (default 64MiB) BOARD_BOOTIMAGE_PARTITION_SIZE ?= "65536" @@ -16,7 +14,7 @@ do_image_boot_vfat[depends] += " \ coreutils-native:do_populate_sysroot \ dosfstools-native:do_populate_sysroot \ mtools-native:do_populate_sysroot \ - ${BOOTLOADER_IMAGE_RECIPE}:do_deploy \ + virtual/bootloader:do_deploy \ virtual/kernel:do_deploy \ ${@TRUSTFENCE_BOOTIMAGE_DEPENDS(d)} \ " @@ -85,7 +83,7 @@ do_image_boot_vfat[imgsuffix] = "." do_image_boot_ubifs[depends] += " \ mtd-utils-native:do_populate_sysroot \ - ${BOOTLOADER_IMAGE_RECIPE}:do_deploy \ + virtual/bootloader:do_deploy \ virtual/kernel:do_deploy \ ${@TRUSTFENCE_BOOTIMAGE_DEPENDS(d)} \ " @@ -164,7 +162,7 @@ IMAGE_TYPEDEP:recovery.vfat = "boot.vfat" do_image_recovery_ubifs[depends] += " \ mtd-utils-native:do_populate_sysroot \ - ${BOOTLOADER_IMAGE_RECIPE}:do_deploy \ + virtual/bootloader:do_deploy \ virtual/kernel:do_deploy \ ${RECOVERY_INITRAMFS_IMAGE}:do_image_complete \ " diff --git a/meta-digi-arm/conf/machine/include/ccimx8m.inc b/meta-digi-arm/conf/machine/include/ccimx8m.inc index ad988f1ac..b6a550d5b 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8m.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8m.inc @@ -13,7 +13,6 @@ UBOOT_SUFFIX = "bin" # The bootloader image that gets flashed consists of U-Boot and several fw binaries EXTRA_IMAGEDEPENDS += "imx-boot" -BOOTLOADER_IMAGE_RECIPE = "imx-boot" # Set InitRAMDisk load address to U-boot initramfs_addr UBOOT_RD_LOADADDRESS = "0x43800000" diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc index df672faed..748d4ca6f 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8x.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc @@ -18,7 +18,6 @@ UBOOT_RD_LOADADDRESS = "0x8A100000" # The bootloader image that gets flashed consists of U-Boot and several fw binaries EXTRA_IMAGEDEPENDS += "imx-boot" -BOOTLOADER_IMAGE_RECIPE = "imx-boot" # The original variable used by NXP to store the mkimage "REV" parameter, # REV_OPTION, has a format of "REV=X0". Since we are interested in building diff --git a/meta-digi-arm/conf/machine/include/ccimx9.inc b/meta-digi-arm/conf/machine/include/ccimx9.inc index b302deb89..738396ef4 100644 --- a/meta-digi-arm/conf/machine/include/ccimx9.inc +++ b/meta-digi-arm/conf/machine/include/ccimx9.inc @@ -25,7 +25,6 @@ KERNEL_IMAGETYPE:ccimx9 = "${@oe.utils.vartrue('TRUSTFENCE_SIGN_ARTIFACTS', 'fit # The bootloader image that gets flashed consists of U-Boot and several fw binaries EXTRA_IMAGEDEPENDS += "imx-boot" -BOOTLOADER_IMAGE_RECIPE = "imx-boot" MACHINE_FEATURES += "pci wifi bluetooth" MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc index 6029e3605..8ba8c386d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc @@ -35,8 +35,6 @@ SRC_URI = " \ BUILD_UBOOT_SCRIPTS ?= "true" -BOOTLOADER_IMAGE_RECIPE ?= "u-boot" - LOCALVERSION ?= "" inherit ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'fsl-u-boot-localversion uuu_bootloader_tag', '', d)}