Skip to contentSkip to conversation

conf: machine: beagleplay*: Update defaults to mainline

PATCH In review Ryan Eatmon 2 participants 4 messages Jan 22, 2025

lore
Share & tools
lore
#0 lore raw

PATCH v2 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
index 3e7f0c1b..f053c11e 100644
@@ -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
index b1a463e1..bc0de3f0 100644
@@ -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
index c27e0abc..72dc145b 100644
@@ -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
index 68d6dced..3824d867 100644
@@ -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
#1 lore raw

PATCH v2 2/2 conf: machine: beaglebone-ai64: Update SPL_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.

---
v2 : Fix typo in subject.

 meta-beagle/conf/machine/beaglebone-ai64.conf | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
meta-beagle/conf/machine/beaglebone-ai64.conf +1 -5
index a521c8cf..ecd3a6e7 100644
@@ -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
#2 lore raw
In reply to Ryan Eatmon
Quoted 4 lines · Ryan Eatmon via lists.yoctoproject.org

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.

I have already sent my Tested-by for v1 - do I need to re-test v2 here? Are there any other changes besides the typo fix in the second patch?

Quoted 80 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
index 3e7f0c1b..f053c11e 100644
@@ -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
index b1a463e1..bc0de3f0 100644
@@ -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
index c27e0abc..72dc145b 100644
@@ -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
index 68d6dced..3824d867 100644
@@ -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
#3 lore raw
Quoted 8 lines · Denys Dmytriyenko
Quoted 4 lines · Ryan Eatmon via lists.yoctoproject.org

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.

I have already sent my Tested-by for v1 - do I need to re-test v2 here? Are there any other changes besides the typo fix in the second patch?

Nope. Just the typo. No need to re-test.

Quoted 81 lines
Quoted 81 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
index 3e7f0c1b..f053c11e 100644
@@ -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
index b1a463e1..bc0de3f0 100644
@@ -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
index c27e0abc..72dc145b 100644
@@ -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
index 68d6dced..3824d867 100644
@@ -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
Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS