[meta-ti][wrynose][PATCH] 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/?h=wrynose&id=2f47b623ea3d8b25b931e43aa751dc145c97f8e5

[2] https://git.openembedded.org/openembedded-core/commit/?h=wrynose&id=d78d6a1e3d79385c6499764c4760d46d28f3cd35

Signed-off-by: Ryan Eatmon <[email protected]>
---
 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 01955470..db409e5b 100644
--- a/meta-ti-bsp/conf/machine/am62axx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf
@@ -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"
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 bc056e6b..cbae21c4 100644
--- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf
@@ -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 = ""
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
index dd91ae66..5f75943c 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
@@ -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"
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
index d1f6660c..44fc82ff 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
@@ -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"
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
 
-- 
2.43.0