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 <[email protected]> --- 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 diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf index e02e10ed..30c7ea7e 100644 --- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf @@ -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" diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf index 44744c46..27cc7c40 100644 --- a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf @@ -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" diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm.conf b/meta-ti-bsp/conf/machine/am62pxx-evm.conf index fd5f269a..4bebe510 100644 --- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf @@ -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)}" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf index 1665f586..e8d7fd05 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf @@ -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" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf index 8319ae19..8ae4af36 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf @@ -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" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc deleted file mode 100644 index c7ce5047..00000000 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc +++ /dev/null @@ -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 -} diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index 9801ffbe..97a895b0 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc @@ -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:" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#19429): https://lists.yoctoproject.org/g/meta-ti/message/19429 Mute This Topic: https://lists.yoctoproject.org/mt/117368954/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
