From ea0bfc75f5b0942b29fe0ece01acb50cf652221d Mon Sep 17 00:00:00 2001 From: Ryan Eatmon Date: Tue, 30 Jun 2026 14:11:10 -0500 Subject: [PATCH] XXX: ti-kernel-fitimage: Fix for FIT_CONF_DEFAULT_DTB changes. Two oe-core changes [1] and [2], have introduced a change in how the kernel-fit-image class generates the entries as related to KERNEL_DTBVENDORED. [1] Corrected the support for KERNEL_DTBVENDORED when generating the entries. But this broke our TI settings and caused build falures because we suddenly had double ti_ti_ entries for the default. [2] Adds support for KERNEL_DTBVENDORED when figuring out the value for FIT_CONF_DEFAULT_DTB when building the fit-image.itd file. With both of these we can drop our custom setting of FIT_CONF_PREFIX and update the values for FIT_CONF_DEFAULT_DTB to match the same strings that go into KERNEL_DEVICETREE. [1] https://git.openembedded.org/openembedded-core/commit/meta/classes-recipe/kernel-fit-image.bbclass?id=4297b94c3728cd2e320d75b68c508e12ab127719 [2] XXX replace with accepted commit before accepting Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/am62axx-evm.conf | 2 +- meta-ti-bsp/conf/machine/am62dxx-evm.conf | 2 +- meta-ti-bsp/conf/machine/am62lxx-evm.conf | 2 +- meta-ti-bsp/conf/machine/am62pxx-evm.conf | 2 +- meta-ti-bsp/conf/machine/am62xx-evm.conf | 2 +- meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 2 +- meta-ti-bsp/conf/machine/am62xxsip-evm.conf | 6 +++--- meta-ti-bsp/recipes-kernel/linux/ti-kernel-fitimage.bb | 1 - 8 files changed, 9 insertions(+), 10 deletions(-) diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf index 3019656a..cf771e18 100644 --- a/meta-ti-bsp/conf/machine/am62axx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf @@ -31,6 +31,6 @@ KERNEL_DEVICETREE = " \ ti/k3-am62x-sk-hdmi-audio.dtbo \ " -FIT_CONF_DEFAULT_DTB = "k3-am62a7-sk.dtb" +FIT_CONF_DEFAULT_DTB = "ti/k3-am62a7-sk.dtb" UBOOT_MACHINE = "am62ax_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62dxx-evm.conf b/meta-ti-bsp/conf/machine/am62dxx-evm.conf index b723d457..08dffd98 100644 --- a/meta-ti-bsp/conf/machine/am62dxx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62dxx-evm.conf @@ -18,7 +18,7 @@ KERNEL_DEVICETREE_PREFIX = " \ KERNEL_DEVICETREE = "" -FIT_CONF_DEFAULT_DTB = "k3-am62d2-evm.dtb" +FIT_CONF_DEFAULT_DTB = "ti/k3-am62d2-evm.dtb" UBOOT_MACHINE = "am62dx_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62lxx-evm.conf b/meta-ti-bsp/conf/machine/am62lxx-evm.conf index 5104549a..7a422617 100644 --- a/meta-ti-bsp/conf/machine/am62lxx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62lxx-evm.conf @@ -17,7 +17,7 @@ KERNEL_DEVICETREE_PREFIX = " \ KERNEL_DEVICETREE = "" UBOOT_MACHINE = "am62lx_evm_defconfig" -FIT_CONF_DEFAULT_DTB = "k3-am62l3-evm.dtb" +FIT_CONF_DEFAULT_DTB = "ti/k3-am62l3-evm.dtb" UBOOT_LOADADDRESS = "0x82400000" UBOOT_ENTRYPOINT = "0x82400000" UBOOT_RD_LOADADDRESS = "0x84000000" diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm.conf b/meta-ti-bsp/conf/machine/am62pxx-evm.conf index f72ba2e0..e3388c14 100644 --- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf @@ -22,7 +22,7 @@ KERNEL_DEVICETREE = " \ ti/k3-am62x-sk-hdmi-audio.dtbo \ " -FIT_CONF_DEFAULT_DTB = "k3-am62p5-sk.dtb" +FIT_CONF_DEFAULT_DTB = "ti/k3-am62p5-sk.dtb" UBOOT_ECDSA_SIGN_CONFIG ?= "ecdsa" UBOOT_ECDSA_SIGN_CONFIG:bsp-ti-6_6 = "" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf index c2012ccb..4d07ca40 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf @@ -31,6 +31,6 @@ KERNEL_DEVICETREE = " \ ti/k3-am62x-sk-hdmi-audio.dtbo \ " -FIT_CONF_DEFAULT_DTB = "k3-am625-sk.dtb" +FIT_CONF_DEFAULT_DTB = "ti/k3-am625-sk.dtb" UBOOT_MACHINE = "am62x_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf index ea590cb6..786416f2 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf @@ -25,6 +25,6 @@ KERNEL_DEVICETREE = " \ ti/k3-am62x-sk-hdmi-audio.dtbo \ " -FIT_CONF_DEFAULT_DTB = "k3-am62-lp-sk.dtb" +FIT_CONF_DEFAULT_DTB = "ti/k3-am62-lp-sk.dtb" UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf index 252a0380..8c5e59de 100644 --- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf @@ -22,9 +22,9 @@ KERNEL_DEVICETREE = " \ ti/k3-am625-sk.dtb \ " -FIT_CONF_DEFAULT_DTB = "k3-am6254xxl-sk.dtb" -FIT_CONF_DEFAULT_DTB:bsp-ti-6_6 = "k3-am625-sk.dtb" -FIT_CONF_DEFAULT_DTB:bsp-ti-6_18 = "k3-am6254atl-sk.dtb" +FIT_CONF_DEFAULT_DTB = "ti/k3-am6254xxl-sk.dtb" +FIT_CONF_DEFAULT_DTB:bsp-ti-6_6 = "ti/k3-am625-sk.dtb" +FIT_CONF_DEFAULT_DTB:bsp-ti-6_18 = "ti/k3-am6254atl-sk.dtb" UBOOT_MACHINE = "am6254xxl_evm_a53_defconfig" UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_a53_defconfig" diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel-fitimage.bb b/meta-ti-bsp/recipes-kernel/linux/ti-kernel-fitimage.bb index cc90d390..d241954c 100644 --- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel-fitimage.bb +++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel-fitimage.bb @@ -1,7 +1,6 @@ SUMMARY = "Generate and sign the fitImage file for TI Machines" FIT_DESC ?= "Kernel fitImage for ${DISTRO_NAME}/${PKGV}/${MACHINE}" -FIT_CONF_PREFIX ?= "conf-ti_" require recipes-kernel/linux/linux-yocto-fitimage.bb