mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-06 02:42:34 +00:00
Code Issues Projects Releases Wiki Activity

u-boot: Adapt to upstream change to UBOOT_CONFIG flow

Browse Source 
A recent change to the UBOOT_CONFIG flow in oe-core [1], introduced
support for UBOOT_FRAGMENTS.  We need to stop using our internal
UBOOT_CONFIG_FRAGMENTS and start using the new UBOOT_FRAGMENTS.

[1] https://git.openembedded.org/openembedded-core/commit/?id=cd9e7304481b24b27df61c03ad73496d18e4d47c

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Ryan Eatmon
2026-01-12 09:48:42 -06:00
parent fc26d5dc11
commit 85c3cc60be
7 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
+1 -1
View File
@@ -6,4 +6,4 @@ require conf/machine/include/k3r5.inc
UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
UBOOT_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
+1 -1
View File
@@ -6,4 +6,4 @@ require conf/machine/include/k3r5.inc
UBOOT_MACHINE = "am62px_evm_r5_defconfig"
UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
UBOOT_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
meta-ti-bsp/conf/machine/am62pxx-evm.conf
+2 -2
View File
@@ -25,9 +25,9 @@ FIT_CONF_DEFAULT_DTB = "k3-am62p5-sk.dtb"
UBOOT_MACHINE = "am62px_evm_a53_defconfig"
# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
# UBOOT_FRAGMENTS holds the list of u-boot config fragments which has to be build
# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
# For AM62P tisdk-display-cluster image, splash screen is handled by SBL.
# Hence, disable the A53 based splash screen using the am62x_evm_prune_splashscreen.config fragment present in ti-u-boot tree
UBOOT_CONFIG_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62x_evm_prune_splashscreen.config', '', d)}"
UBOOT_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62x_evm_prune_splashscreen.config', '', d)}"
meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
+1 -1
View File
@@ -6,4 +6,4 @@ require conf/machine/include/k3r5.inc
UBOOT_MACHINE = "am62x_evm_r5_defconfig"
UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
UBOOT_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
+1 -1
View File
@@ -6,4 +6,4 @@ require conf/machine/include/k3r5.inc
UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
UBOOT_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc
-7
View File
@@ -1,7 +0,0 @@
do_configure:append () {
if [ -n "${UBOOT_CONFIG_FRAGMENTS}" ] && [ -n "${UBOOT_MACHINE}" ]
then
oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} ${UBOOT_CONFIG_FRAGMENTS}
oe_runmake -C ${S} O=${B} olddefconfig
fi
}
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
-1
View File
@@ -7,7 +7,6 @@ do_compile:prepend () {
require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot-common.inc
require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
require u-boot-mergeconfig.inc
FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot:"