u-boot: Adapt to upstream change to UBOOT_CONFIG flow
PATCH 1/1 u-boot: Adapt to upstream change to UBOOT_CONFIG flow
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
--- meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf | 2 +- meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf | 2 +- meta-ti-bsp/conf/machine/am62pxx-evm.conf | 4 ++-- meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf | 2 +- meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 2 +- meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc | 7 ------- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 1 - 7 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc
meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 deleted +0 -7
@@ -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 +0 -1
@@ -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:"
Signature · 1 line
2.43.0
meta-ti / na / 20260120191542.2214409-1-reatmon
PRC Results: PASS
=========================================================
check-yocto-patches: PASS
=========================================================
Patches
----------------------------------------
WARN - [meta-ti][master][PATCH] u-boot: Adapt to upstream change to UBOOT_CONFIG flow
WARN: Commit message does not include file/recipe name: u-boot: Adapt to upstream change to UBOOT_CONFIG flow. (COMMIT-MESSAGE-2)
patch
For details on the above errors/warnings visit: https://lists.yoctoproject.org/g/meta-ti/wiki/40887
=========================================================
apply-yocto-patch: PASS
=========================================================
master
=====================
Summary:
- Patch Series: [meta-ti][master][PATCH] u-boot: Adapt to upstream change to UBOOT_CONFIG flow
- Submitter: From: Ryan Eatmon <[email protected]>
- Date: Date: Tue, 20 Jan 2026 13:15:41 -0600
- Num Patches: 1
- Mailing List (public inbox) Commit SHA: e55a6808d46ba3601c1c4d1390897e07b91b3b91
Applied to:
- Repository: lcpd-prc-meta-ti
- Base Branch: master-next
- Commit Author: LCPD Automation Script <[email protected]>
- Commit Subject: CI/CD Auto-Merger: cicd.master.202601171053
- Commit SHA: fc26d5dc11e24ba44afe8cbd9fa7639631b3d209
Patches
----------------------------------------
All patches applied
=========================================================
check-yocto-repo: PASS
=========================================================
master
=====================
PASS
=========================================================
yocto-check-layers: PASS
=========================================================
master - PASS
=====================
All checks passed