mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-07 19:32:58 +00:00
Code Issues Projects Releases Wiki Activity

Revert "conf: machine: Move to new UBOOT_FRAGMENTS"

Browse Source 
This reverts commit fc52833b34.
This commit is contained in:
Ryan Eatmon
2024-09-12 12:23:29 -05:00
parent 9a12c2b49b
commit 1e536ba12e
7 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-ti-bsp/conf/machine/am62pxx-evm.conf
+7 -2
View File
@@ -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)}"
meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf
-8
View File
@@ -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] = ""
meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
+2
View File
@@ -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"
meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
+2 -2
View File
@@ -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"
meta-ti-bsp/conf/machine/beaglebone-ai64.conf
+2 -2
View File
@@ -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"
meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
+3 -3
View File
@@ -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"
meta-ti-bsp/conf/machine/beagleplay.conf
+3 -3
View File
@@ -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"