Skip to contentSkip to conversation

ti-kernel-fitimage: Fix for FIT_CONF_DEFAULT_DTB changes

PATCH In review Ryan Eatmon 2 participants 2 messages Jul 17

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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] https://git.openembedded.org/openembedded-core/commit/?id=3bceb2dabeee13c0a80ddd74ea7ae991606d6772

---
 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(-)
meta-ti-bsp/conf/machine/am62axx-evm.conf +1 -1
index 01955470..db409e5b 100644
@@ -30,6 +30,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"
meta-ti-bsp/conf/machine/am62dxx-evm.conf +1 -1
index b723d457..08dffd98 100644
@@ -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"
 
meta-ti-bsp/conf/machine/am62lxx-evm.conf +1 -1
index 5104549a..7a422617 100644
@@ -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"
meta-ti-bsp/conf/machine/am62pxx-evm.conf +1 -1
index bc056e6b..cbae21c4 100644
@@ -21,7 +21,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 = ""
meta-ti-bsp/conf/machine/am62xx-evm.conf +1 -1
index dd91ae66..5f75943c 100644
@@ -30,6 +30,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"
meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +1 -1
index d1f6660c..44fc82ff 100644
@@ -24,6 +24,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"
meta-ti-bsp/conf/machine/am62xxsip-evm.conf +3 -3
index 252a0380..8c5e59de 100644
@@ -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"
meta-ti-bsp/recipes-kernel/linux/ti-kernel-fitimage.bb +0 -1
index cc90d390..d241954c 100644
@@ -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
 
Signature · 1 line
2.43.0
#1 lore raw

meta-ti / na / 20260717022540.117237-1-reatmon

PRC Results: PASS

=========================================================
check-yocto-patches: PASS
=========================================================
Patches
----------------------------------------
All patches passed

=========================================================
apply-yocto-patch: PASS
=========================================================
master
=====================
Summary:
- Patch Series: [meta-ti][master][PATCH] ti-kernel-fitimage: Fix for FIT_CONF_DEFAULT_DTB changes
- Submitter: From: Ryan Eatmon <[email protected]>
- Date: Date: Thu, 16 Jul 2026 21:25:40 -0500
- Num Patches: 1
- Mailing List (public inbox) Commit SHA: 1bc6dd96782cb1b4d6c24b9eb6676774ed982541

Applied to:
- Repository: lcpd-prc-meta-ti
- Base Branch: master-wip
- Commit Author: Ryan Eatmon <[email protected]>
- Commit Subject: XXX: Temp update to ti-linux-fw branch and SRCREV
- Commit SHA: ba3ac1c0a1753bfc6dcecc132bf7de38851673aa

Patches
----------------------------------------
All patches applied

=========================================================
check-yocto-repo: PASS
=========================================================
master
=====================
PASS

=========================================================
yocto-check-layers: PASS
=========================================================
master - PASS
=====================
All checks passed