From d639ee043e9d2e6b8822201242b5a5f67499bfaf Mon Sep 17 00:00:00 2001 From: "Rodrigo M. Duarte" Date: Mon, 5 May 2025 11:20:44 -0300 Subject: imx-boot: Add BOOT_VARIANT variable at prefix to generated binaries Signed-off-by: Rodrigo M. Duarte (cherry picked from commit 0cc7db1dc77f0c5497878ee21814f9940f9a21c1) --- recipes-bsp/imx-mkimage/imx-boot_1.0.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index bdbb97c9..eae1778c 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb @@ -44,6 +44,8 @@ OEI_NAME ?= "oei-${OEI_CORE}-*.bin" ATF_MACHINE_NAME ?= "bl31-${ATF_PLATFORM}.bin" ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}" +BOOT_VARIANT ?= "" + TOOLS_NAME ?= "mkimage_imx8" IMX_BOOT_SOC_TARGET ?= "INVALID" @@ -222,7 +224,7 @@ do_compile() { UBOOT_DTB_NAME_EXTRA="${dtb_name}" fi UBOOT_NAME_EXTRA="u-boot-${MACHINE}.bin-${UBOOT_CONFIG_EXTRA}" - BOOT_CONFIG_MACHINE_EXTRA="imx-boot-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin" + BOOT_CONFIG_MACHINE_EXTRA="imx-boot${BOOT_VARIANT}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin" for target in ${IMXBOOT_TARGETS}; do compile_${SOC_FAMILY} @@ -273,7 +275,7 @@ do_install () { bbnote "UBOOT_CONFIG = $type" UBOOT_CONFIG_EXTRA="$type" - BOOT_CONFIG_MACHINE_EXTRA="imx-boot-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin" + BOOT_CONFIG_MACHINE_EXTRA="imx-boot${BOOT_VARIANT}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin" for target in ${IMXBOOT_TARGETS}; do install -m 0644 ${S}/${BOOT_CONFIG_MACHINE_EXTRA}-${target} ${D}/boot/ @@ -380,7 +382,7 @@ do_deploy() { for type in ${UBOOT_CONFIG}; do UBOOT_CONFIG_EXTRA="$type" UBOOT_NAME_EXTRA="u-boot-${MACHINE}.bin-${UBOOT_CONFIG_EXTRA}" - BOOT_CONFIG_MACHINE_EXTRA="imx-boot-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin" + BOOT_CONFIG_MACHINE_EXTRA="imx-boot${BOOT_VARIANT}-${MACHINE}-${UBOOT_CONFIG_EXTRA}.bin" if [ -e ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} ] ; then install -m 0644 ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG_EXTRA} \ -- cgit v1.2.3-54-g00ecf