conf: machine: beagleplay*: Update defaults to mainline
PATCH 1/2 conf: machine: beagleplay*: Update defaults to mainline
The defaults for UBOOT_MACHINE and SPL_BINARY are now aligned with the mainline values and new ti-6_1 values for the previous defaults were created to capture those. Also updated the meta-beagle beagleplay since it inherits the beagleplay-ti settings.
--- meta-beagle/conf/machine/beagleplay-k3r5.conf | 2 +- meta-beagle/conf/machine/beagleplay.conf | 5 +---- meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf | 6 ++---- meta-ti-bsp/conf/machine/beagleplay-ti.conf | 9 +++------ 4 files changed, 7 insertions(+), 15 deletions(-)
meta-beagle/conf/machine/beagleplay-k3r5.conf +1 -1
@@ -6,6 +6,6 @@ require conf/machine/beagleplay-ti-k3r5.conf require conf/machine/include/beagle-bsp.inc -UBOOT_MACHINE:bsp-bb_org-6_6 = "am62x_beagleplay_r5_defconfig" +UBOOT_MACHINE:bsp-bb_org-6_1 = "am62x_evm_r5_defconfig" UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_r5.config"
meta-beagle/conf/machine/beagleplay.conf +1 -4
@@ -6,13 +6,10 @@ require conf/machine/beagleplay-ti.conf require conf/machine/include/beagle-bsp.inc -UBOOT_MACHINE:bsp-bb_org-6_6 = "am62x_beagleplay_a53_defconfig" +UBOOT_MACHINE:bsp-bb_org-6_1 = "am62x_evm_a53_defconfig" UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_a53.config" -SPL_BINARY:bsp-bb_org-6_6 = "tispl.bin_unsigned" -SPL_BINARYNAME:bsp-bb_org-6_6 = "tispl.bin" - KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \ ti/k3-am625-beagleplay-csi2-ov5640.dtbo \ ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf +2 -4
@@ -8,9 +8,7 @@ SYSFW_SOC = "am62x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" -UBOOT_MACHINE = "am62x_evm_r5_defconfig" -UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_r5_defconfig" -UBOOT_MACHINE:bsp-ti-6_12 = "am62x_beagleplay_r5_defconfig" +UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig" +UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig" 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-ti.conf +3 -6
@@ -19,15 +19,12 @@ TFA_K3_SYSTEM_SUSPEND = "1" OPTEEMACHINE = "k3-am62x" -UBOOT_MACHINE = "am62x_evm_a53_defconfig" -UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_a53_defconfig" -UBOOT_MACHINE:bsp-ti-6_12 = "am62x_beagleplay_a53_defconfig" +UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig" +UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig" UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "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" +SPL_BINARY = "tispl.bin_unsigned" KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am625-beagle \
Signature · 1 line
2.17.1
PATCH 2/2 conf: machine: beaglebone-ai64: Update SPLY_BINARY
Rather than override the value for SPL_BINARY for all bsps, simply just set the value to the correct value. This should be ok since all beaglebone-ai64 variations should use tispl.bin_unsigned.
--- meta-beagle/conf/machine/beaglebone-ai64.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
meta-beagle/conf/machine/beaglebone-ai64.conf +1 -5
@@ -18,11 +18,7 @@ UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config" UBOOT_MACHINE:bsp-bb_org-6_1 = "j721e_evm_a72_config" UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "j721e_beagleboneai64_a72.config" -SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned" -SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin" - -SPL_BINARY:bsp-bb_org-6_6 = "tispl.bin_unsigned" -SPL_BINARYNAME:bsp-bb_org-6_6 = "tispl.bin" +SPL_BINARY = "tispl.bin_unsigned" KERNEL_DEVICETREE_PREFIX = " \ ti/k3-j721e \
Signature · 1 line
2.17.1
Re: [meta-ti][master/scarthgap][PATCH 2/2] conf: machine: beaglebone-ai64: Update SPLY_BINARY
Quoted 6 lines · Ryan Eatmon via lists.yoctoproject.org
Rather than override the value for
SPL_BINARYfor all bsps, simply just set the value to the correct value. This should be ok since all beaglebone-ai64 variations should use tispl.bin_unsigned.Signed-off-by Ryan Eatmon <[email protected]>---
Typo in subject line, s/SPLY_BINAR/SPL_BINARY
Andrew
Quoted 31 lines
meta-beagle/conf/machine/beaglebone-ai64.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)meta-beagle/conf/machine/beaglebone-ai64.conf +1
-6@@ -18,11 +18,7 @@ UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config" UBOOT_MACHINE:bsp-bb_org-6_1 = "j721e_evm_a72_config" UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "j721e_beagleboneai64_a72.config" -SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned" -SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin" - -SPL_BINARY:bsp-bb_org-6_6 = "tispl.bin_unsigned" -SPL_BINARYNAME:bsp-bb_org-6_6 = "tispl.bin" +SPL_BINARY = "tispl.bin_unsigned" KERNEL_DEVICETREE_PREFIX = " \ ti/k3-j721e \ -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#18190): https://lists.yoctoproject.org/g/meta-ti/message/18190
Mute This Topic: https://lists.yoctoproject.org/mt/110598031/3619733
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-ti][master/scarthgap][PATCH 2/2] conf: machine: beaglebone-ai64: Update SPLY_BINARY
Quoted 9 lines · Andrew Davis
Quoted 6 lines · Ryan Eatmon via lists.yoctoproject.org
Rather than override the value for
SPL_BINARYfor all bsps, simply just set the value to the correct value. This should be ok since all beaglebone-ai64 variations should use tispl.bin_unsigned.Signed-off-by Ryan Eatmon <[email protected]>---
Typo in subject line, s/SPLY_BINAR/SPL_BINARY
Yeah. I'm going to do a v2 before I accept it.
Quoted 32 lines
Andrew
Quoted 30 lines
meta-beagle/conf/machine/beaglebone-ai64.conf| 6 +-----1 file changed, 1 insertion(+), 5 deletions(-)meta-beagle/conf/machine/beaglebone-ai64.conf +0
-0@@ -18,11 +18,7 @@ UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 ="j721e_beagleboneai64_a72.config"
UBOOT_MACHINE:bsp-bb_org-6_1 = "j721e_evm_a72_config" UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "j721e_beagleboneai64_a72.config"meta-beagle/conf/machine/beaglebone-ai64.conf +1
-5-SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned" -SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin" - -SPL_BINARY:bsp-bb_org-6_6 = "tispl.bin_unsigned" -SPL_BINARYNAME:bsp-bb_org-6_6 = "tispl.bin" +SPL_BINARY = "tispl.bin_unsigned"
KERNEL_DEVICETREE_PREFIX= " \
ti/k3-j721e \-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#18190): https://lists.yoctoproject.org/g/meta-ti/message/18190
Mute This Topic: https://lists.yoctoproject.org/mt/110598031/3619733
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS
Re: [meta-ti][master/scarthgap][PATCH 2/2] conf: machine: beaglebone-ai64: Update SPLY_BINARY
In reply to Ryan EatmonQuoted 5 lines · Ryan Eatmon via lists.yoctoproject.org
Rather than override the value for
SPL_BINARYfor all bsps, simply just set the value to the correct value. This should be ok since all beaglebone-ai64 variations should use tispl.bin_unsigned.Signed-off-by Ryan Eatmon <[email protected]>
Quoted 23 lines
--- meta-beagle/conf/machine/beaglebone-ai64.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)meta-beagle/conf/machine/beaglebone-ai64.conf +1
-5@@ -18,11 +18,7 @@ UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config" UBOOT_MACHINE:bsp-bb_org-6_1 = "j721e_evm_a72_config" UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "j721e_beagleboneai64_a72.config" -SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned" -SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin" - -SPL_BINARY:bsp-bb_org-6_6 = "tispl.bin_unsigned" -SPL_BINARYNAME:bsp-bb_org-6_6 = "tispl.bin" +SPL_BINARY = "tispl.bin_unsigned" KERNEL_DEVICETREE_PREFIX = " \ ti/k3-j721e \Signature · 1 line
2.17.1
Quoted 6 lines · Ryan Eatmon via lists.yoctoproject.org
The defaults for
UBOOT_MACHINEandSPL_BINARYare now aligned with the mainline values and new ti-6_1 values for the previous defaults were created to capture those. Also updated the meta-beagle beagleplay since it inherits the beagleplay-ti settings.Signed-off-by Ryan Eatmon <[email protected]>
Quoted 79 lines
--- meta-beagle/conf/machine/beagleplay-k3r5.conf | 2 +- meta-beagle/conf/machine/beagleplay.conf | 5 +---- meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf | 6 ++---- meta-ti-bsp/conf/machine/beagleplay-ti.conf | 9 +++------ 4 files changed, 7 insertions(+), 15 deletions(-)meta-beagle/conf/machine/beagleplay-k3r5.conf +1
-1@@ -6,6 +6,6 @@ require conf/machine/beagleplay-ti-k3r5.conf require conf/machine/include/beagle-bsp.inc -UBOOT_MACHINE:bsp-bb_org-6_6 = "am62x_beagleplay_r5_defconfig" +UBOOT_MACHINE:bsp-bb_org-6_1 = "am62x_evm_r5_defconfig" UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_r5.config"meta-beagle/conf/machine/beagleplay.conf +1
-4@@ -6,13 +6,10 @@ require conf/machine/beagleplay-ti.conf require conf/machine/include/beagle-bsp.inc -UBOOT_MACHINE:bsp-bb_org-6_6 = "am62x_beagleplay_a53_defconfig" +UBOOT_MACHINE:bsp-bb_org-6_1 = "am62x_evm_a53_defconfig" UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_a53.config" -SPL_BINARY:bsp-bb_org-6_6 = "tispl.bin_unsigned" -SPL_BINARYNAME:bsp-bb_org-6_6 = "tispl.bin" - KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \ ti/k3-am625-beagleplay-csi2-ov5640.dtbo \ ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf +2
-4@@ -8,9 +8,7 @@ SYSFW_SOC = "am62x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" -UBOOT_MACHINE = "am62x_evm_r5_defconfig" -UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_r5_defconfig" -UBOOT_MACHINE:bsp-ti-6_12 = "am62x_beagleplay_r5_defconfig" +UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig" +UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig" 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-ti.conf +3
-6@@ -19,15 +19,12 @@ TFA_K3_SYSTEM_SUSPEND = "1" OPTEEMACHINE = "k3-am62x" -UBOOT_MACHINE = "am62x_evm_a53_defconfig" -UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_a53_defconfig" -UBOOT_MACHINE:bsp-ti-6_12 = "am62x_beagleplay_a53_defconfig" +UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig" +UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig" UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "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" +SPL_BINARY = "tispl.bin_unsigned" KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am625-beagle \Signature · 1 line
2.17.1