Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2025-10-21 17:54:37 +02:00
parent 3dfd6b77ef
commit 13f8046d31
5 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta-digi-arm/classes/image_types_digi.bbclass
View File

@ -3,8 +3,6 @@ inherit image_types
################################################################################ ################################################################################
# BOOT IMAGES # # BOOT IMAGES #
################################################################################ ################################################################################
BOOTLOADER_IMAGE_RECIPE ?= "u-boot"
# Boot partition size in KiB, (default 64MiB) # Boot partition size in KiB, (default 64MiB)
BOARD_BOOTIMAGE_PARTITION_SIZE ?= "65536" BOARD_BOOTIMAGE_PARTITION_SIZE ?= "65536"
@ -16,7 +14,7 @@ do_image_boot_vfat[depends] += " \
coreutils-native:do_populate_sysroot \ coreutils-native:do_populate_sysroot \
dosfstools-native:do_populate_sysroot \ dosfstools-native:do_populate_sysroot \
mtools-native:do_populate_sysroot \ mtools-native:do_populate_sysroot \
${BOOTLOADER_IMAGE_RECIPE}:do_deploy \ virtual/bootloader:do_deploy \
virtual/kernel:do_deploy \ virtual/kernel:do_deploy \
${@TRUSTFENCE_BOOTIMAGE_DEPENDS(d)} \ ${@TRUSTFENCE_BOOTIMAGE_DEPENDS(d)} \
" "
@ -85,7 +83,7 @@ do_image_boot_vfat[imgsuffix] = "."
do_image_boot_ubifs[depends] += " \ do_image_boot_ubifs[depends] += " \
mtd-utils-native:do_populate_sysroot \ mtd-utils-native:do_populate_sysroot \
${BOOTLOADER_IMAGE_RECIPE}:do_deploy \ virtual/bootloader:do_deploy \
virtual/kernel:do_deploy \ virtual/kernel:do_deploy \
${@TRUSTFENCE_BOOTIMAGE_DEPENDS(d)} \ ${@TRUSTFENCE_BOOTIMAGE_DEPENDS(d)} \
" "
@ -164,7 +162,7 @@ IMAGE_TYPEDEP:recovery.vfat = "boot.vfat"
do_image_recovery_ubifs[depends] += " \ do_image_recovery_ubifs[depends] += " \
mtd-utils-native:do_populate_sysroot \ mtd-utils-native:do_populate_sysroot \
${BOOTLOADER_IMAGE_RECIPE}:do_deploy \ virtual/bootloader:do_deploy \
virtual/kernel:do_deploy \ virtual/kernel:do_deploy \
${RECOVERY_INITRAMFS_IMAGE}:do_image_complete \ ${RECOVERY_INITRAMFS_IMAGE}:do_image_complete \
" "

1
meta-digi-arm/conf/machine/include/ccimx8m.inc
View File

@ -13,7 +13,6 @@ UBOOT_SUFFIX = "bin"
# The bootloader image that gets flashed consists of U-Boot and several fw binaries # The bootloader image that gets flashed consists of U-Boot and several fw binaries
EXTRA_IMAGEDEPENDS += "imx-boot" EXTRA_IMAGEDEPENDS += "imx-boot"
BOOTLOADER_IMAGE_RECIPE = "imx-boot"
# Set InitRAMDisk load address to U-boot initramfs_addr # Set InitRAMDisk load address to U-boot initramfs_addr
UBOOT_RD_LOADADDRESS = "0x43800000" UBOOT_RD_LOADADDRESS = "0x43800000"

1
meta-digi-arm/conf/machine/include/ccimx8x.inc
View File

@ -18,7 +18,6 @@ UBOOT_RD_LOADADDRESS = "0x8A100000"
# The bootloader image that gets flashed consists of U-Boot and several fw binaries # The bootloader image that gets flashed consists of U-Boot and several fw binaries
EXTRA_IMAGEDEPENDS += "imx-boot" EXTRA_IMAGEDEPENDS += "imx-boot"
BOOTLOADER_IMAGE_RECIPE = "imx-boot"
# The original variable used by NXP to store the mkimage "REV" parameter, # 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 # REV_OPTION, has a format of "REV=X0". Since we are interested in building

1
meta-digi-arm/conf/machine/include/ccimx9.inc
View File

@ -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 # The bootloader image that gets flashed consists of U-Boot and several fw binaries
EXTRA_IMAGEDEPENDS += "imx-boot" EXTRA_IMAGEDEPENDS += "imx-boot"
BOOTLOADER_IMAGE_RECIPE = "imx-boot"
MACHINE_FEATURES += "pci wifi bluetooth" MACHINE_FEATURES += "pci wifi bluetooth"
MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse" MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse"

2
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc
View File

@ -35,8 +35,6 @@ SRC_URI = " \
BUILD_UBOOT_SCRIPTS ?= "true" BUILD_UBOOT_SCRIPTS ?= "true"
BOOTLOADER_IMAGE_RECIPE ?= "u-boot"
LOCALVERSION ?= "" LOCALVERSION ?= ""
inherit ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'fsl-u-boot-localversion uuu_bootloader_tag', '', d)} inherit ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'fsl-u-boot-localversion uuu_bootloader_tag', '', d)}