Migrate the machine configs to use the new UBOOT_FRAGMENTS methodology.
Signed-off-by: Ryan Eatmon <[email protected]>
---
meta-ti-bsp/conf/machine/am62pxx-evm.conf | 9 ++-------
meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf | 8 ++++++++
meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf | 2 --
meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf | 4 ++--
meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 4 ++--
meta-ti-bsp/conf/machine/beagleplay-k3r5.conf | 6 +++---
meta-ti-bsp/conf/machine/beagleplay.conf | 6 +++---
7 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm.conf
b/meta-ti-bsp/conf/machine/am62pxx-evm.conf
index 676e64a4..7aff3414 100644
--- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf
@@ -22,11 +22,6 @@ KERNEL_DEVICETREE = " \
UBOOT_MACHINE = "am62px_evm_a53_defconfig"
-# UBOOT_CONFIG_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)}"
-UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 =
"${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1',
'am62px_evm_prune_splashscreen.config', '', d)}"
+UBOOT_FRAGMENTS:bsp-ti-6_1 =
"${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1',
'am62px_evm_prune_splashscreen.config', '', d)}"
diff --git a/meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf
b/meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf
index 7d65e6af..6a8f2760 100644
--- a/meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf
@@ -18,3 +18,11 @@ UBOOT_CONFIG:bsp-ti-6_1 ??= "evm"
UBOOT_CONFIG[sip] = "am62xsip_evm_r5_defconfig"
UBOOT_CONFIG[lpsk] = "am62x_lpsk_r5_defconfig"
UBOOT_CONFIG[evm] = "am62x_evm_r5_defconfig"
+
+UBOOT_FRAGMENTS_CONFIG_SIP = ""
+UBOOT_FRAGMENTS_CONFIG_SIP:bsp-ti-6_1 = "am62xsip_sk_r5"
+
+UBOOT_FRAGMENTS_CONFIG[sip] = "${UBOOT_FRAGMENTS_CONFIG_SIP}"
+UBOOT_FRAGMENTS_CONFIG[lpsk] = ""
+UBOOT_FRAGMENTS_CONFIG[evm] = ""
+
diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
index ab538ff3..990675be 100644
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
@@ -9,5 +9,3 @@ UBOOT_CONFIG = "sip"
UBOOT_CONFIG:bsp-ti-6_1 = ""
UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am62xsip_sk_r5.config"
diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
index d415a212..3361e85a 100644
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
@@ -19,5 +19,5 @@ UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
UBOOT_MACHINE = "j721e_evm_r5_defconfig"
UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_r5_defconfig"
-UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_r5.config"
-UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_r5.config"
+UBOOT_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_r5.config"
+UBOOT_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_r5.config"
diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
index 56e1ed4e..0eaae980 100644
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
+++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
@@ -12,8 +12,8 @@ IMAGE_SR2_HS_SE_FILES:bsp-bb_org = ""
UBOOT_MACHINE = "j721e_evm_a72_config"
UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_a72_defconfig"
-UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config"
-UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_a72.config"
+UBOOT_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config"
+UBOOT_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_a72.config"
SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned"
SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin"
diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
index 338a6fbf..11fc6d29 100644
--- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
@@ -11,6 +11,6 @@ SYSFW_SUFFIX = "gp"
UBOOT_MACHINE = "am62x_evm_r5_defconfig"
UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_r5_defconfig"
-UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_r5.config"
-UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_r5.config"
-UBOOT_CONFIG_FRAGMENTS:bsp-mainline = "beagleplay_r5.config"
+UBOOT_FRAGMENTS:bsp-bb_org = "am625_beagleplay_r5.config"
+UBOOT_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_r5.config"
+UBOOT_FRAGMENTS:bsp-mainline = "beagleplay_r5.config"
diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf
b/meta-ti-bsp/conf/machine/beagleplay.conf
index d420c6c7..883ef538 100644
--- a/meta-ti-bsp/conf/machine/beagleplay.conf
+++ b/meta-ti-bsp/conf/machine/beagleplay.conf
@@ -20,9 +20,9 @@ OPTEEMACHINE = "k3-am62x"
UBOOT_MACHINE = "am62x_evm_a53_defconfig"
UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_a53_defconfig"
-UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_a53.config"
-UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_a53.config"
-UBOOT_CONFIG_FRAGMENTS:bsp-mainline = "beagleplay_a53.config"
+UBOOT_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_a53.config"
+UBOOT_FRAGMENTS:bsp-bb_org = "am625_beagleplay_a53.config"
+UBOOT_FRAGMENTS:bsp-mainline = "beagleplay_a53.config"
SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned"
SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#17941):
https://lists.yoctoproject.org/g/meta-ti/message/17941
Mute This Topic: https://lists.yoctoproject.org/mt/107912772/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
