From 12a5aa5cb3eee065dcb1309b4c7133c3f28d0840 Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Sun, 10 Mar 2024 11:46:06 -0300 Subject: u-boot-imx_2022.04.bb: Add UUU_BOOTLOADER_UNTAGGED variable After commit 4375edbb9da1 ("uuu_bootloader_tag.bbclass: Add UUU_BOOTLOADER_UNTAGGED"), the option for a untagged binary was added to uuu_bootloader_tag.bbclass. The u-boot-imx recipe also uses this binary, thefore add UUU_BOOTLOADER_TAGGED to this recipe as well. (Cherry picked from commit 35f3ef016c21 and adjusted for kirkstone) Signed-off-by: Hiago De Franco --- recipes-bsp/u-boot/u-boot-imx_2022.04.bb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-imx_2022.04.bb b/recipes-bsp/u-boot/u-boot-imx_2022.04.bb index f3364df7..d48395c3 100644 --- a/recipes-bsp/u-boot/u-boot-imx_2022.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx_2022.04.bb @@ -9,12 +9,15 @@ PROVIDES += "u-boot" inherit uuu_bootloader_tag -UUU_BOOTLOADER = "" -UUU_BOOTLOADER:mx6-generic-bsp = "${UBOOT_BINARY}" -UUU_BOOTLOADER:mx7-generic-bsp = "${UBOOT_BINARY}" -UUU_BOOTLOADER_TAGGED = "" -UUU_BOOTLOADER_TAGGED:mx6-generic-bsp = "u-boot-tagged.${UBOOT_SUFFIX}" -UUU_BOOTLOADER_TAGGED:mx7-generic-bsp = "u-boot-tagged.${UBOOT_SUFFIX}" +UUU_BOOTLOADER = "" +UUU_BOOTLOADER:mx6-generic-bsp = "${UBOOT_BINARY}" +UUU_BOOTLOADER:mx7-generic-bsp = "${UBOOT_BINARY}" +UUU_BOOTLOADER_TAGGED = "" +UUU_BOOTLOADER_TAGGED:mx6-generic-bsp = "u-boot-tagged.${UBOOT_SUFFIX}" +UUU_BOOTLOADER_TAGGED:mx7-generic-bsp = "u-boot-tagged.${UBOOT_SUFFIX}" +UUU_BOOTLOADER_UNTAGGED = "" +UUU_BOOTLOADER_UNTAGGED:mx6-generic-bsp = "u-boot-untagged.${UBOOT_SUFFIX}" +UUU_BOOTLOADER_UNTAGGED:mx7-generic-bsp = "u-boot-untagged.${UBOOT_SUFFIX}" do_deploy:append:mx8m-generic-bsp() { # Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary -- cgit v1.2.3-54-g00ecf