From 1e536ba12ec955cb87d9836bcdff75acd8fbdb9f Mon Sep 17 00:00:00 2001 From: Ryan Eatmon Date: Thu, 12 Sep 2024 12:23:29 -0500 Subject: [PATCH] Revert "conf: machine: Move to new UBOOT_FRAGMENTS" This reverts commit fc52833b3423d9a11bc85739c08c753977666e39. --- 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, 19 insertions(+), 20 deletions(-) diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm.conf b/meta-ti-bsp/conf/machine/am62pxx-evm.conf index 7aff3414..676e64a4 100644 --- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf @@ -22,6 +22,11 @@ KERNEL_DEVICETREE = " \ UBOOT_MACHINE = "am62px_evm_a53_defconfig" -UBOOT_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62x_evm_prune_splashscreen.config', '', d)}" +# 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:bsp-ti-6_1 = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62px_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)}" diff --git a/meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf index 6a8f2760..7d65e6af 100644 --- a/meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf @@ -18,11 +18,3 @@ 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 990675be..ab538ff3 100644 --- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf @@ -9,3 +9,5 @@ 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 3361e85a..d415a212 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_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_r5.config" -UBOOT_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_r5.config" +UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_r5.config" +UBOOT_CONFIG_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 0eaae980..56e1ed4e 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_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config" -UBOOT_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_a72.config" +UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config" +UBOOT_CONFIG_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 11fc6d29..338a6fbf 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_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" +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" diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf index 883ef538..d420c6c7 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_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" +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" SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned" SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin"