mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-07-16 06:17:51 +00:00
Code Issues Projects Releases Wiki Activity

XXX: ti-kernel-fitimage: Fix for FIT_CONF_DEFAULT_DTB changes.

Browse Source 
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 <reatmon@ti.com>
This commit is contained in:
Ryan Eatmon
2026-06-30 14:11:10 -05:00
parent ba4823fe37
commit ea0bfc75f5
8 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-ti-bsp/conf/machine/am62axx-evm.conf
+1 -1
View File
@@ -31,6 +31,6 @@ KERNEL_DEVICETREE = " \
ti/k3-am62x-sk-hdmi-audio.dtbo \ 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" UBOOT_MACHINE = "am62ax_evm_a53_defconfig"
meta-ti-bsp/conf/machine/am62dxx-evm.conf
+1 -1
View File
@@ -18,7 +18,7 @@ KERNEL_DEVICETREE_PREFIX = " \
KERNEL_DEVICETREE = "" 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" UBOOT_MACHINE = "am62dx_evm_a53_defconfig"
meta-ti-bsp/conf/machine/am62lxx-evm.conf
+1 -1
View File
@@ -17,7 +17,7 @@ KERNEL_DEVICETREE_PREFIX = " \
KERNEL_DEVICETREE = "" KERNEL_DEVICETREE = ""
UBOOT_MACHINE = "am62lx_evm_defconfig" 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_LOADADDRESS = "0x82400000"
UBOOT_ENTRYPOINT = "0x82400000" UBOOT_ENTRYPOINT = "0x82400000"
UBOOT_RD_LOADADDRESS = "0x84000000" UBOOT_RD_LOADADDRESS = "0x84000000"
meta-ti-bsp/conf/machine/am62pxx-evm.conf
+1 -1
View File
@@ -22,7 +22,7 @@ KERNEL_DEVICETREE = " \
ti/k3-am62x-sk-hdmi-audio.dtbo \ 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 ?= "ecdsa"
UBOOT_ECDSA_SIGN_CONFIG:bsp-ti-6_6 = "" UBOOT_ECDSA_SIGN_CONFIG:bsp-ti-6_6 = ""
meta-ti-bsp/conf/machine/am62xx-evm.conf
+1 -1
View File
@@ -31,6 +31,6 @@ KERNEL_DEVICETREE = " \
ti/k3-am62x-sk-hdmi-audio.dtbo \ 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" UBOOT_MACHINE = "am62x_evm_a53_defconfig"
meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+1 -1
View File
@@ -25,6 +25,6 @@ KERNEL_DEVICETREE = " \
ti/k3-am62x-sk-hdmi-audio.dtbo \ 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" UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
meta-ti-bsp/conf/machine/am62xxsip-evm.conf
+3 -3
View File
@@ -22,9 +22,9 @@ KERNEL_DEVICETREE = " \
ti/k3-am625-sk.dtb \ ti/k3-am625-sk.dtb \
" "
FIT_CONF_DEFAULT_DTB = "k3-am6254xxl-sk.dtb" FIT_CONF_DEFAULT_DTB = "ti/k3-am6254xxl-sk.dtb"
FIT_CONF_DEFAULT_DTB:bsp-ti-6_6 = "k3-am625-sk.dtb" FIT_CONF_DEFAULT_DTB:bsp-ti-6_6 = "ti/k3-am625-sk.dtb"
FIT_CONF_DEFAULT_DTB:bsp-ti-6_18 = "k3-am6254atl-sk.dtb" FIT_CONF_DEFAULT_DTB:bsp-ti-6_18 = "ti/k3-am6254atl-sk.dtb"
UBOOT_MACHINE = "am6254xxl_evm_a53_defconfig" UBOOT_MACHINE = "am6254xxl_evm_a53_defconfig"
UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_a53_defconfig" UBOOT_MACHINE:bsp-ti-6_6 = "am62xsip_evm_a53_defconfig"
meta-ti-bsp/recipes-kernel/linux/ti-kernel-fitimage.bb
-1
View File
@@ -1,7 +1,6 @@
SUMMARY = "Generate and sign the fitImage file for TI Machines" SUMMARY = "Generate and sign the fitImage file for TI Machines"
FIT_DESC ?= "Kernel fitImage for ${DISTRO_NAME}/${PKGV}/${MACHINE}" FIT_DESC ?= "Kernel fitImage for ${DISTRO_NAME}/${PKGV}/${MACHINE}"
FIT_CONF_PREFIX ?= "conf-ti_"
require recipes-kernel/linux/linux-yocto-fitimage.bb require recipes-kernel/linux/linux-yocto-fitimage.bb