Skip to contentSkip to conversation

conf: machine: am62xx-unified: Create new common am62xx machine

RFC In review Ryan Eatmon 2 participants 5 messages Aug 8, 2024 – Aug 14, 2024 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

RFC 1/1 conf: machine: am62xx-unified: Create new common am62xx machine

To reduce the number of required builds for testing purposes, create a common unified am62xx machine target that can produce all of the files for all of the variant platforms related to am62xx (sip and lp). Additionally, continue to support building the specific target if desired.

---
 meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf |  9 +---
 meta-ti-bsp/conf/machine/am62xx-evm.conf      |  5 +--
 .../conf/machine/am62xx-lp-evm-k3r5.conf      |  9 +---
 meta-ti-bsp/conf/machine/am62xx-lp-evm.conf   |  5 +--
 .../conf/machine/am62xx-unified-k3r5.conf     | 20 +++++++++
 meta-ti-bsp/conf/machine/am62xx-unified.conf  | 43 +++++++++++++++++++
 .../conf/machine/am62xxsip-evm-k3r5.conf      |  8 ++--
 meta-ti-bsp/conf/machine/am62xxsip-evm.conf   |  6 +--
 8 files changed, 76 insertions(+), 29 deletions(-)
 create mode 100644 meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf
 create mode 100644 meta-ti-bsp/conf/machine/am62xx-unified.conf
meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +2 -7
index 548369ca..3a819835 100644
@@ -2,11 +2,6 @@
 #@NAME: AM62XX EVM (R5F)
 #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
 
-require conf/machine/include/k3r5.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified-k3r5.conf
 
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+UBOOT_CONFIG = "evm"
meta-ti-bsp/conf/machine/am62xx-evm.conf +2 -3
index 31de4a14..8c80cb1f 100644
@@ -2,8 +2,7 @@
 #@NAME: AM62XX EVM
 #@DESCRIPTION: Machine configuration for the TI AM62XX EVM
 
-require conf/machine/include/am62xx.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified.conf
 
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am625 \
@@ -30,4 +29,4 @@ KERNEL_DEVICETREE = " \
     ti/k3-am62x-sk-hdmi-audio.dtbo \
 "
 
-UBOOT_MACHINE = "am62x_evm_a53_defconfig"
+UBOOT_CONFIG = "evm"
meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf +2 -7
index 52b69a72..fb760e99 100644
@@ -2,11 +2,6 @@
 #@NAME: AM62XX LP GP EVM (R5F)
 #@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core)
 
-require conf/machine/include/k3r5.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified-k3r5.conf
 
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
+UBOOT_CONFIG = "lpsk"
meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +2 -3
index e9271f5b..f7d89d68 100644
@@ -2,8 +2,7 @@
 #@NAME: AM62XX LP EVM
 #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
 
-require conf/machine/include/am62xx.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified.conf
 
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am62-lp \
@@ -19,4 +18,4 @@ KERNEL_DEVICETREE = " \
     ti/k3-am62x-sk-hdmi-audio.dtbo \
 "
 
-UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
+UBOOT_CONFIG = "lpsk"
meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf new file +20 -0
new file mode 100644
index 00000000..7d65e6af
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM62XX EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+require conf/machine/include/ti-extras.inc
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = ""
+# Last config in the list is default
+UBOOT_CONFIG ??= "sip lpsk evm"
+
+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"
meta-ti-bsp/conf/machine/am62xx-unified.conf new file +43 -0

43 lines not on this page · raw message

meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf +3 -5
index 55bc530b..ab538ff3 100644
@@ -2,13 +2,11 @@
 #@NAME: AM62XX SIP EVM (R5F)
 #@DESCRIPTION: Machine configuration for the TI AM62xx SIP EVM (R5F core)
 
-require conf/machine/include/k3r5.inc
+require conf/machine/am62xx-unified-k3r5.conf
 
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
+UBOOT_CONFIG = "sip"
 
-UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
+UBOOT_CONFIG:bsp-ti-6_1 = ""
 
 UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"
 
meta-ti-bsp/conf/machine/am62xxsip-evm.conf +2 -4
index 8104329e..6b179b80 100644
@@ -2,7 +2,7 @@
 #@NAME: AM62XX SIP EVM
 #@DESCRIPTION: Machine configuration for the TI AM62XX SIP EVM
 
-require conf/machine/include/am62xx.inc
+require conf/machine/am62xx-unified.conf
 
 KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am625 \
@@ -13,6 +13,4 @@ KERNEL_DEVICETREE = " \
     ti/k3-am625-sk.dtb \
 "
 
-UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
-
-UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"
+UBOOT_CONFIG = "sip"
Signature · 1 line
2.17.1
#1 lore raw

Hi Ryan & Denys,

Quoted 7 lines · Ryan Eatmon via lists.yoctoproject.org

To reduce the number of required builds for testing purposes, create a common unified am62xx machine target that can produce all of the files for all of the variant platforms related to am62xx (sip and lp). Additionally, continue to support ZjQcmQRYFpfptBannerStart
This message was sent from outside of Texas Instruments.
Do not click links or open attachments unless you recognize the source of this email and know the content is safe. If you wish to report this message to IT Security, please forward the message as an attachment to [email protected] Report Suspicious
<https://us-phishalarm-ewt.proofpoint.com/EWT/v1/G3vK!uFdqXRfP9mwbKwZFHJNj_V92vi6mT9DGTpQZeFU0LNi8euAkYQM024IcX-dd54y6XIw8nwcGUnREacyk1hI$>

Quoted 8 lines

ZjQcmQRYFpfptBannerEnd
To reduce the number of required builds for testing purposes, create a common unified am62xx machine target that can produce all of the files for all of the variant platforms related to am62xx (sip and lp). Additionally, continue to support building the specific target if desired.

We need to see how do we enable the support of fragment configs with UBOOT_CONFIG as I see atleast ti-u-boot-2024.04 still following the fragment config model for few usecases.

I see two approaches,

- Add the support in oe-core to handle u-boot fragment configs

- Extend u-boot-mergeconfig.inc we currently have in meta-ti [1] to support UBOOT_CONFIG

Personally, I would prefer the first option if that's acceptable to oe-core as well but I would like to hear your opinions on the same

[1]: https://git.ti.com/cgit/arago-project/meta-ti/tree/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc?h=scarthgap

---
Chirag

Quoted 218 lines
---
  meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf |  9 +---
  meta-ti-bsp/conf/machine/am62xx-evm.conf      |  5 +--
  .../conf/machine/am62xx-lp-evm-k3r5.conf      |  9 +---
  meta-ti-bsp/conf/machine/am62xx-lp-evm.conf   |  5 +--
  .../conf/machine/am62xx-unified-k3r5.conf     | 20 +++++++++
  meta-ti-bsp/conf/machine/am62xx-unified.conf  | 43 +++++++++++++++++++
  .../conf/machine/am62xxsip-evm-k3r5.conf      |  8 ++--
  meta-ti-bsp/conf/machine/am62xxsip-evm.conf   |  6 +--
  8 files changed, 76 insertions(+), 29 deletions(-)

create mode 100644 meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am62xx-unified.conf

meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +2 -7
index 548369ca..3a819835 100644
@@ -2,11 +2,6 @@
  #@NAME: AM62XX EVM (R5F)
  #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
 
-require conf/machine/include/k3r5.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified-k3r5.conf
 
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+UBOOT_CONFIG = "evm"
meta-ti-bsp/conf/machine/am62xx-evm.conf +2 -3
index 31de4a14..8c80cb1f 100644
@@ -2,8 +2,7 @@
  #@NAME: AM62XX EVM
  #@DESCRIPTION: Machine configuration for the TI AM62XX EVM
 
-require conf/machine/include/am62xx.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified.conf
 
  KERNEL_DEVICETREE_PREFIX = " \
      ti/k3-am625 \
@@ -30,4 +29,4 @@ KERNEL_DEVICETREE = " \
      ti/k3-am62x-sk-hdmi-audio.dtbo \
  "
 
-UBOOT_MACHINE = "am62x_evm_a53_defconfig"
+UBOOT_CONFIG = "evm"
meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf +2 -7
index 52b69a72..fb760e99 100644
@@ -2,11 +2,6 @@
  #@NAME: AM62XX LP GP EVM (R5F)
  #@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core)
 
-require conf/machine/include/k3r5.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified-k3r5.conf
 
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
+UBOOT_CONFIG = "lpsk"
meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +2 -3
index e9271f5b..f7d89d68 100644
@@ -2,8 +2,7 @@
  #@NAME: AM62XX LP EVM
  #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
 
-require conf/machine/include/am62xx.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified.conf
 
  KERNEL_DEVICETREE_PREFIX = " \
      ti/k3-am62-lp \
@@ -19,4 +18,4 @@ KERNEL_DEVICETREE = " \
      ti/k3-am62x-sk-hdmi-audio.dtbo \
  "
 
-UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
+UBOOT_CONFIG = "lpsk"
meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf new file +20 -0
new file mode 100644
index 00000000..7d65e6af
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM62XX EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+require conf/machine/include/ti-extras.inc
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = ""
+# Last config in the list is default
+UBOOT_CONFIG ??= "sip lpsk evm"
+
+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"
meta-ti-bsp/conf/machine/am62xx-unified.conf new file +43 -0
new file mode 100644
index 00000000..5b03239f
@@ -0,0 +1,43 @@
+#@TYPE: Machine
+#@NAME: AM62XX Unified EVM
+#@DESCRIPTION: Machine configuration for the TI AM62XX EVM and all of its variations
+
+require conf/machine/include/am62xx.inc
+require conf/machine/include/ti-extras.inc
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am62-lp \
+    ti/k3-am625 \
+    ti/k3-am62x-sk \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am62-lp-sk.dtb \
+    ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
+    ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
+    ti/k3-am625-beagleplay.dtb \
+    ti/k3-am625-phyboard-lyra-rdk.dtb \
+    ti/k3-am625-sk.dtb \
+    ti/k3-am625-verdin-nonwifi-dahlia.dtb \
+    ti/k3-am625-verdin-nonwifi-dev.dtb \
+    ti/k3-am625-verdin-nonwifi-mallow.dtb \
+    ti/k3-am625-verdin-nonwifi-yavia.dtb \
+    ti/k3-am625-verdin-wifi-dahlia.dtb \
+    ti/k3-am625-verdin-wifi-dev.dtb \
+    ti/k3-am625-verdin-wifi-mallow.dtb \
+    ti/k3-am625-verdin-wifi-yavia.dtb \
+    ti/k3-am62x-sk-csi2-imx219.dtbo \
+    ti/k3-am62x-sk-csi2-ov5640.dtbo \
+    ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
+    ti/k3-am62x-sk-hdmi-audio.dtbo \
+"
+
+UBOOT_MACHINE = ""
+# Last config in the list is default
+UBOOT_CONFIG ??= "sip lpsk evm"
+
+UBOOT_CONFIG:bsp-ti-6_1 ??= "lpsk evm"
+
+UBOOT_CONFIG[sip] = "am62xsip_evm_a53_defconfig"
+UBOOT_CONFIG[lpsk] = "am62x_lpsk_a53_defconfig"
+UBOOT_CONFIG[evm] = "am62x_evm_a53_defconfig"
meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf +3 -5
index 55bc530b..ab538ff3 100644
@@ -2,13 +2,11 @@
  #@NAME: AM62XX SIP EVM (R5F)
  #@DESCRIPTION: Machine configuration for the TI AM62xx SIP EVM (R5F core)
 
-require conf/machine/include/k3r5.inc
+require conf/machine/am62xx-unified-k3r5.conf
 
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
+UBOOT_CONFIG = "sip"
 
-UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
+UBOOT_CONFIG:bsp-ti-6_1 = ""
 
  UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"
 
meta-ti-bsp/conf/machine/am62xxsip-evm.conf +2 -4
index 8104329e..6b179b80 100644
@@ -2,7 +2,7 @@
  #@NAME: AM62XX SIP EVM
  #@DESCRIPTION: Machine configuration for the TI AM62XX SIP EVM
 
-require conf/machine/include/am62xx.inc
+require conf/machine/am62xx-unified.conf
 
  KERNEL_DEVICETREE_PREFIX = " \
      ti/k3-am625 \
@@ -13,6 +13,4 @@ KERNEL_DEVICETREE = " \
      ti/k3-am625-sk.dtb \
  "
 
-UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
-
-UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"
+UBOOT_CONFIG = "sip"
Signature · 10 lines
2.17.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#17931): https://urldefense.com/v3/__https://lists.yoctoproject.org/g/meta-ti/message/17931__;!!G3vK!U-r2MVyHaQGOtRj3aNhTjsDUYyItxHnzUGRG-G5JLIPNsN8lJvMKVSLNpaAab2D6lT8SjjhTdHlsGIgYCUbpGqaVKNaNnb30MQ$
Mute This Topic: https://urldefense.com/v3/__https://lists.yoctoproject.org/mt/107796202/7030289__;!!G3vK!U-r2MVyHaQGOtRj3aNhTjsDUYyItxHnzUGRG-G5JLIPNsN8lJvMKVSLNpaAab2D6lT8SjjhTdHlsGIgYCUbpGqaVKNZDezDSJQ$
Group Owner: [email protected]
Unsubscribe: https://urldefense.com/v3/__https://lists.yoctoproject.org/g/meta-ti/unsub__;!!G3vK!U-r2MVyHaQGOtRj3aNhTjsDUYyItxHnzUGRG-G5JLIPNsN8lJvMKVSLNpaAab2D6lT8SjjhTdHlsGIgYCUbpGqaVKNZtDaB-gQ$  [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
#2 lore raw
Quoted 15 lines · Chirag Shilwant

Hi Ryan & Denys,

Quoted 13 lines · Ryan Eatmon via lists.yoctoproject.org

To reduce the number of required builds for testing purposes, create a common unified am62xx machine target that can produce all of the files for all of the variant platforms related to am62xx (sip and lp). Additionally, continue to support ZjQcmQRYFpfptBannerStart
This message was sent from outside of Texas Instruments.
Do not click links or open attachments unless you recognize the source of this email and know the content is safe. If you wish to report this message to IT Security, please forward the message as an attachment to [email protected] Report Suspicious
<https://us-phishalarm-ewt.proofpoint.com/EWT/v1/G3vK!uFdqXRfP9mwbKwZFHJNj_V92vi6mT9DGTpQZeFU0LNi8euAkYQM024IcX-dd54y6XIw8nwcGUnREacyk1hI$>
ZjQcmQRYFpfptBannerEnd
To reduce the number of required builds for testing purposes, create a
common unified am62xx machine target that can produce all of the files
for all of the variant platforms related to am62xx (sip and lp).
Additionally, continue to support building the specific target if
desired.

Quoted 6 lines
Quoted 1 line

We need to see how do we enable the support of fragment configs with UBOOT_CONFIG as I see atleast ti-u-boot-2024.04 still following the fragment config model for few usecases.

I've been working on this topic all day today. I'll probably have an additional RFC version tomorrow once I'm done testing it.

Once we are happy with everything we can decide if we want to push the solution to oe-core, or keep it in meta-ti.

Quoted 221 lines

I see two approaches,

- Add the support in oe-core to handle u-boot fragment configs

- Extend u-boot-mergeconfig.inc we currently have in meta-ti [1] to support UBOOT_CONFIG

Personally, I would prefer the first option if that's acceptable to oe-core as well but I would like to hear your opinions on the same

[1]: https://git.ti.com/cgit/arago-project/meta-ti/tree/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc?h=scarthgap

---
Chirag

Quoted 201 lines

---
  meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf |  9 +--- meta-ti-bsp/conf/machine/am62xx-evm.conf      |  5 +-- .../conf/machine/am62xx-lp-evm-k3r5.conf      |  9 +--- meta-ti-bsp/conf/machine/am62xx-lp-evm.conf   |  5 +-- .../conf/machine/am62xx-unified-k3r5.conf     | 20 +++++++++ meta-ti-bsp/conf/machine/am62xx-unified.conf  | 43 +++++++++++++++++++ .../conf/machine/am62xxsip-evm-k3r5.conf      |  8 ++-- meta-ti-bsp/conf/machine/am62xxsip-evm.conf   |  6 +--

  8 files changed, 76 insertions(+), 29 deletions(-)

  create mode 100644 meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am62xx-unified.conf

meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +2 -7
index 548369ca..3a819835 100644
@@ -2,11 +2,6 @@
   #@NAME: AM62XX EVM (R5F)
   #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
-require conf/machine/include/k3r5.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified-k3r5.conf
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+UBOOT_CONFIG = "evm"
meta-ti-bsp/conf/machine/am62xx-evm.conf +1 -2
index 31de4a14..8c80cb1f 100644
@@ -2,8 +2,7 @@
   #@NAME: AM62XX EVM
   #@DESCRIPTION: Machine configuration for the TI AM62XX EVM
-require conf/machine/include/am62xx.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified.conf
   KERNEL_DEVICETREE_PREFIX = " \
       ti/k3-am625 \
@@ -30,4 +29,4 @@ KERNEL_DEVICETREE = " \
       ti/k3-am62x-sk-hdmi-audio.dtbo \

  "

meta-ti-bsp/conf/machine/am62xx-evm.conf +1 -1
-UBOOT_MACHINE = "am62x_evm_a53_defconfig"
+UBOOT_CONFIG = "evm"
meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf +2 -7
index 52b69a72..fb760e99 100644
@@ -2,11 +2,6 @@
   #@NAME: AM62XX LP GP EVM (R5F)
   #@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core)
-require conf/machine/include/k3r5.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified-k3r5.conf
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
+UBOOT_CONFIG = "lpsk"
meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +1 -2
index e9271f5b..f7d89d68 100644
@@ -2,8 +2,7 @@
   #@NAME: AM62XX LP EVM
   #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
-require conf/machine/include/am62xx.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified.conf
   KERNEL_DEVICETREE_PREFIX = " \
       ti/k3-am62-lp \
@@ -19,4 +18,4 @@ KERNEL_DEVICETREE = " \
       ti/k3-am62x-sk-hdmi-audio.dtbo \

  "

meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +1 -1
-UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
+UBOOT_CONFIG = "lpsk"
meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf new file +20 -0
new file mode 100644
index 00000000..7d65e6af
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM62XX EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+require conf/machine/include/ti-extras.inc
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = ""
+# Last config in the list is default
+UBOOT_CONFIG ??= "sip lpsk evm"
+
+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"
meta-ti-bsp/conf/machine/am62xx-unified.conf new file +3 -0
new file mode 100644
index 00000000..5b03239f
@@ -0,0 +1,43 @@
+#@TYPE: Machine
+#@NAME: AM62XX Unified EVM
+#@DESCRIPTION: Machine configuration for the TI AM62XX EVM and all of 

its variations

meta-ti-bsp/conf/machine/am62xx-unified.conf new file +40 -0
+
+require conf/machine/include/am62xx.inc
+require conf/machine/include/ti-extras.inc
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am62-lp \
+    ti/k3-am625 \
+    ti/k3-am62x-sk \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am62-lp-sk.dtb \
+    ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
+    ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
+    ti/k3-am625-beagleplay.dtb \
+    ti/k3-am625-phyboard-lyra-rdk.dtb \
+    ti/k3-am625-sk.dtb \
+    ti/k3-am625-verdin-nonwifi-dahlia.dtb \
+    ti/k3-am625-verdin-nonwifi-dev.dtb \
+    ti/k3-am625-verdin-nonwifi-mallow.dtb \
+    ti/k3-am625-verdin-nonwifi-yavia.dtb \
+    ti/k3-am625-verdin-wifi-dahlia.dtb \
+    ti/k3-am625-verdin-wifi-dev.dtb \
+    ti/k3-am625-verdin-wifi-mallow.dtb \
+    ti/k3-am625-verdin-wifi-yavia.dtb \
+    ti/k3-am62x-sk-csi2-imx219.dtbo \
+    ti/k3-am62x-sk-csi2-ov5640.dtbo \
+    ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
+    ti/k3-am62x-sk-hdmi-audio.dtbo \
+"
+
+UBOOT_MACHINE = ""
+# Last config in the list is default
+UBOOT_CONFIG ??= "sip lpsk evm"
+
+UBOOT_CONFIG:bsp-ti-6_1 ??= "lpsk evm"
+
+UBOOT_CONFIG[sip] = "am62xsip_evm_a53_defconfig"
+UBOOT_CONFIG[lpsk] = "am62x_lpsk_a53_defconfig"
+UBOOT_CONFIG[evm] = "am62x_evm_a53_defconfig"
meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf +3 -5
index 55bc530b..ab538ff3 100644
@@ -2,13 +2,11 @@
   #@NAME: AM62XX SIP EVM (R5F)
   #@DESCRIPTION: Machine configuration for the TI AM62xx SIP EVM (R5F core)
-require conf/machine/include/k3r5.inc
+require conf/machine/am62xx-unified-k3r5.conf
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
+UBOOT_CONFIG = "sip"
-UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
+UBOOT_CONFIG:bsp-ti-6_1 = ""

  UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"

meta-ti-bsp/conf/machine/am62xxsip-evm.conf +1 -1
index 8104329e..6b179b80 100644
@@ -2,7 +2,7 @@
   #@NAME: AM62XX SIP EVM
   #@DESCRIPTION: Machine configuration for the TI AM62XX SIP EVM
-require conf/machine/include/am62xx.inc
+require conf/machine/am62xx-unified.conf
   KERNEL_DEVICETREE_PREFIX = " \
       ti/k3-am625 \
@@ -13,6 +13,4 @@ KERNEL_DEVICETREE = " \
       ti/k3-am625-sk.dtb \

  "

meta-ti-bsp/conf/machine/am62xxsip-evm.conf +1 -3
-UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
-
-UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"
+UBOOT_CONFIG = "sip"
Signature · 10 lines
2.17.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#17931): https://urldefense.com/v3/__https://lists.yoctoproject.org/g/meta-ti/message/17931__;!!G3vK!U-r2MVyHaQGOtRj3aNhTjsDUYyItxHnzUGRG-G5JLIPNsN8lJvMKVSLNpaAab2D6lT8SjjhTdHlsGIgYCUbpGqaVKNaNnb30MQ$
Mute This Topic: https://urldefense.com/v3/__https://lists.yoctoproject.org/mt/107796202/7030289__;!!G3vK!U-r2MVyHaQGOtRj3aNhTjsDUYyItxHnzUGRG-G5JLIPNsN8lJvMKVSLNpaAab2D6lT8SjjhTdHlsGIgYCUbpGqaVKNZDezDSJQ$
Group Owner: [email protected]
Unsubscribe: https://urldefense.com/v3/__https://lists.yoctoproject.org/g/meta-ti/unsub__;!!G3vK!U-r2MVyHaQGOtRj3aNhTjsDUYyItxHnzUGRG-G5JLIPNsN8lJvMKVSLNpaAab2D6lT8SjjhTdHlsGIgYCUbpGqaVKNZtDaB-gQ$  [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw
Quoted 22 lines · Ryan Eatmon via lists.yoctoproject.org
Quoted 19 lines · Chirag Shilwant

Hi Ryan & Denys,

Quoted 14 lines · Ryan Eatmon via lists.yoctoproject.org

To reduce the number of required builds for testing purposes, create a common unified am62xx machine target that can produce all of the files for all of the variant platforms related to am62xx (sip and lp). Additionally, continue to support ZjQcmQRYFpfptBannerStart
This message was sent from outside of Texas Instruments.
Do not click links or open attachments unless you recognize the source of this email and know the content is safe. If you wish to report this message to IT Security, please forward the message as an attachment to [email protected] Report Suspicious
<https://us-phishalarm-ewt.proofpoint.com/EWT/v1/G3vK!uFdqXRfP9mwbKwZFHJNj_V92vi6mT9DGTpQZeFU0LNi8euAkYQM024IcX-dd54y6XIw8nwcGUnREacyk1hI$>
ZjQcmQRYFpfptBannerEnd
To reduce the number of required builds for testing purposes, create a
common unified am62xx machine target that can produce all of the files
for all of the variant platforms related to am62xx (sip and lp).
Additionally, continue to support building the specific target if
desired.

Quoted 6 lines
Quoted 2 lines

We need to see how do we enable the support of fragment configs with UBOOT_CONFIG as I see atleast ti-u-boot-2024.04 still following the fragment config model for few usecases.

I've been working on this topic all day today.  I'll probably have an additional RFC version tomorrow once I'm done testing it.

Once we are happy with everything we can decide if we want to push the solution to oe-core, or keep it in meta-ti.

But to be fair, there are no fragments in the am62xx family. There were back under the 6.1 bsp, but under 6.6 the fragment it is gone.

Quoted 227 lines
Quoted 208 lines

I see two approaches,

- Add the support in oe-core to handle u-boot fragment configs

- Extend u-boot-mergeconfig.inc we currently have in meta-ti [1] to support UBOOT_CONFIG

Personally, I would prefer the first option if that's acceptable to oe-core as well but I would like to hear your opinions on the same

[1]: https://git.ti.com/cgit/arago-project/meta-ti/tree/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc?h=scarthgap

---
Chirag

Quoted 187 lines

---
  meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf |  9 +--- meta-ti-bsp/conf/machine/am62xx-evm.conf      |  5 +-- .../conf/machine/am62xx-lp-evm-k3r5.conf      |  9 +--- meta-ti-bsp/conf/machine/am62xx-lp-evm.conf   |  5 +-- .../conf/machine/am62xx-unified-k3r5.conf     | 20 +++++++++ meta-ti-bsp/conf/machine/am62xx-unified.conf  | 43 +++++++++++++++++++ .../conf/machine/am62xxsip-evm-k3r5.conf      |  8 ++-- meta-ti-bsp/conf/machine/am62xxsip-evm.conf   |  6 +--

  8 files changed, 76 insertions(+), 29 deletions(-)

  create mode 100644 meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am62xx-unified.conf

meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +2 -7
index 548369ca..3a819835 100644
@@ -2,11 +2,6 @@
   #@NAME: AM62XX EVM (R5F)
   #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
-require conf/machine/include/k3r5.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified-k3r5.conf
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+UBOOT_CONFIG = "evm"
meta-ti-bsp/conf/machine/am62xx-evm.conf +1 -2
index 31de4a14..8c80cb1f 100644
@@ -2,8 +2,7 @@
   #@NAME: AM62XX EVM
   #@DESCRIPTION: Machine configuration for the TI AM62XX EVM
-require conf/machine/include/am62xx.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified.conf
   KERNEL_DEVICETREE_PREFIX = " \
       ti/k3-am625 \
@@ -30,4 +29,4 @@ KERNEL_DEVICETREE = " \
       ti/k3-am62x-sk-hdmi-audio.dtbo \

  "

meta-ti-bsp/conf/machine/am62xx-evm.conf +1 -1
-UBOOT_MACHINE = "am62x_evm_a53_defconfig"
+UBOOT_CONFIG = "evm"
meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf +2 -7
index 52b69a72..fb760e99 100644
@@ -2,11 +2,6 @@
   #@NAME: AM62XX LP GP EVM (R5F)
   #@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core)
-require conf/machine/include/k3r5.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified-k3r5.conf
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
+UBOOT_CONFIG = "lpsk"
meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +1 -2
index e9271f5b..f7d89d68 100644
@@ -2,8 +2,7 @@
   #@NAME: AM62XX LP EVM
   #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
-require conf/machine/include/am62xx.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified.conf
   KERNEL_DEVICETREE_PREFIX = " \
       ti/k3-am62-lp \
@@ -19,4 +18,4 @@ KERNEL_DEVICETREE = " \
       ti/k3-am62x-sk-hdmi-audio.dtbo \

  "

meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +1 -1
-UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
+UBOOT_CONFIG = "lpsk"
meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf new file +20 -0
new file mode 100644
index 00000000..7d65e6af
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM62XX EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+require conf/machine/include/ti-extras.inc
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = ""
+# Last config in the list is default
+UBOOT_CONFIG ??= "sip lpsk evm"
+
+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"
meta-ti-bsp/conf/machine/am62xx-unified.conf new file +3 -0
new file mode 100644
index 00000000..5b03239f
@@ -0,0 +1,43 @@
+#@TYPE: Machine
+#@NAME: AM62XX Unified EVM
+#@DESCRIPTION: Machine configuration for the TI AM62XX EVM and all 

of its variations

meta-ti-bsp/conf/machine/am62xx-unified.conf new file +40 -0
+
+require conf/machine/include/am62xx.inc
+require conf/machine/include/ti-extras.inc
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am62-lp \
+    ti/k3-am625 \
+    ti/k3-am62x-sk \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am62-lp-sk.dtb \
+    ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
+    ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
+    ti/k3-am625-beagleplay.dtb \
+    ti/k3-am625-phyboard-lyra-rdk.dtb \
+    ti/k3-am625-sk.dtb \
+    ti/k3-am625-verdin-nonwifi-dahlia.dtb \
+    ti/k3-am625-verdin-nonwifi-dev.dtb \
+    ti/k3-am625-verdin-nonwifi-mallow.dtb \
+    ti/k3-am625-verdin-nonwifi-yavia.dtb \
+    ti/k3-am625-verdin-wifi-dahlia.dtb \
+    ti/k3-am625-verdin-wifi-dev.dtb \
+    ti/k3-am625-verdin-wifi-mallow.dtb \
+    ti/k3-am625-verdin-wifi-yavia.dtb \
+    ti/k3-am62x-sk-csi2-imx219.dtbo \
+    ti/k3-am62x-sk-csi2-ov5640.dtbo \
+    ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
+    ti/k3-am62x-sk-hdmi-audio.dtbo \
+"
+
+UBOOT_MACHINE = ""
+# Last config in the list is default
+UBOOT_CONFIG ??= "sip lpsk evm"
+
+UBOOT_CONFIG:bsp-ti-6_1 ??= "lpsk evm"
+
+UBOOT_CONFIG[sip] = "am62xsip_evm_a53_defconfig"
+UBOOT_CONFIG[lpsk] = "am62x_lpsk_a53_defconfig"
+UBOOT_CONFIG[evm] = "am62x_evm_a53_defconfig"
meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf +3 -5
index 55bc530b..ab538ff3 100644
@@ -2,13 +2,11 @@
   #@NAME: AM62XX SIP EVM (R5F)
   #@DESCRIPTION: Machine configuration for the TI AM62xx SIP EVM (R5F core)
-require conf/machine/include/k3r5.inc
+require conf/machine/am62xx-unified-k3r5.conf
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
+UBOOT_CONFIG = "sip"
-UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
+UBOOT_CONFIG:bsp-ti-6_1 = ""

  UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"

meta-ti-bsp/conf/machine/am62xxsip-evm.conf +1 -1
index 8104329e..6b179b80 100644
@@ -2,7 +2,7 @@
   #@NAME: AM62XX SIP EVM
   #@DESCRIPTION: Machine configuration for the TI AM62XX SIP EVM
-require conf/machine/include/am62xx.inc
+require conf/machine/am62xx-unified.conf
   KERNEL_DEVICETREE_PREFIX = " \
       ti/k3-am625 \
@@ -13,6 +13,4 @@ KERNEL_DEVICETREE = " \
       ti/k3-am625-sk.dtb \

  "

meta-ti-bsp/conf/machine/am62xxsip-evm.conf +0 -2
-UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
-
Quoted 8 lines
Quoted 8 lines
meta-ti-bsp/conf/machine/am62xxsip-evm.conf +1 -1
-UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"
+UBOOT_CONFIG = "sip"
Signature · 1 line
2.17.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#17937): https://lists.yoctoproject.org/g/meta-ti/message/17937
Mute This Topic: https://lists.yoctoproject.org/mt/107796202/6551054
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
#5 lore raw
Quoted 26 lines · Ryan Eatmon
Quoted 23 lines · Ryan Eatmon via lists.yoctoproject.org
Quoted 20 lines · Chirag Shilwant

Hi Ryan & Denys,

Quoted 15 lines · Ryan Eatmon via lists.yoctoproject.org

To reduce the number of required builds for testing purposes, create a common unified am62xx machine target that can produce all of the files for all of the variant platforms related to am62xx (sip and lp). Additionally, continue to support ZjQcmQRYFpfptBannerStart
This message was sent from outside of Texas Instruments.
Do not click links or open attachments unless you recognize the source of this email and know the content is safe. If you wish to report this message to IT Security, please forward the message as an attachment to [email protected] Report Suspicious
<https://us-phishalarm-ewt.proofpoint.com/EWT/v1/G3vK!uFdqXRfP9mwbKwZFHJNj_V92vi6mT9DGTpQZeFU0LNi8euAkYQM024IcX-dd54y6XIw8nwcGUnREacyk1hI$>

ZjQcmQRYFpfptBannerEnd
To reduce the number of required builds for testing purposes, create a common unified am62xx machine target that can produce all of the files for all of the variant platforms related to am62xx (sip and lp). Additionally, continue to support building the specific target if desired.

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

We need to see how do we enable the support of fragment configs with UBOOT_CONFIG as I see atleast ti-u-boot-2024.04 still following the fragment config model for few usecases.

I've been working on this topic all day today.  I'll probably have an additional RFC version tomorrow once I'm done testing it.

Once we are happy with everything we can decide if we want to push the solution to oe-core, or keep it in meta-ti.

But to be fair, there are no fragments in the am62xx family. There were back under the 6.1 bsp, but under 6.6 the fragment it is gone.

From Yocto pov that's true but again not for ti-u-boot-2024.04 perspective. We still have many fragment configs in u-boot tree for am62xx family. For Instance - am62x_a53_splashscreen.config, am62x_a53_usbdfu.config, etc [1]

Though they currently aren't in default machine configurations of meta-ti for am62xx family but we never know what happens in future. Also, not supporting u-boot fragments via meta-ti would eventually need a signup from baseport team to never use it. Which means the 6.1 bsp flow, where 62sip, 62lp had fragment model shouldn't be prefered by ti-u-boot in future.

Praneeth/ Vignesh,

Correct me if I'm wrong but AFAIR, fragments where added in 6.1 bsp based on upstream feedbacks & were removed from 6.6 bsp for the same reason. So, we can't rule out the possibility of that fragments being added back to default flow in future LTS.

[1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/configs?h=ti-u-boot-2024.04

---
Chirag

Quoted 231 lines
Quoted 230 lines
Quoted 211 lines

I see two approaches,

- Add the support in oe-core to handle u-boot fragment configs

- Extend u-boot-mergeconfig.inc we currently have in meta-ti [1] to support UBOOT_CONFIG

Personally, I would prefer the first option if that's acceptable to oe-core as well but I would like to hear your opinions on the same

[1]: https://git.ti.com/cgit/arago-project/meta-ti/tree/meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc?h=scarthgap

---
Chirag

Quoted 188 lines

---
  meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf |  9 +--- meta-ti-bsp/conf/machine/am62xx-evm.conf      |  5 +-- .../conf/machine/am62xx-lp-evm-k3r5.conf      |  9 +--- meta-ti-bsp/conf/machine/am62xx-lp-evm.conf   |  5 +-- .../conf/machine/am62xx-unified-k3r5.conf     | 20 +++++++++ meta-ti-bsp/conf/machine/am62xx-unified.conf  | 43
+++++++++++++++++++
  .../conf/machine/am62xxsip-evm-k3r5.conf      |  8 ++-- meta-ti-bsp/conf/machine/am62xxsip-evm.conf   |  6 +--

  8 files changed, 76 insertions(+), 29 deletions(-)

  create mode 100644 meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am62xx-unified.conf

meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +2 -7
index 548369ca..3a819835 100644
@@ -2,11 +2,6 @@
   #@NAME: AM62XX EVM (R5F)
   #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
-require conf/machine/include/k3r5.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified-k3r5.conf
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+UBOOT_CONFIG = "evm"
meta-ti-bsp/conf/machine/am62xx-evm.conf +1 -2
index 31de4a14..8c80cb1f 100644
@@ -2,8 +2,7 @@
   #@NAME: AM62XX EVM
   #@DESCRIPTION: Machine configuration for the TI AM62XX EVM
-require conf/machine/include/am62xx.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified.conf
   KERNEL_DEVICETREE_PREFIX = " \
       ti/k3-am625 \
@@ -30,4 +29,4 @@ KERNEL_DEVICETREE = " \
       ti/k3-am62x-sk-hdmi-audio.dtbo \

  "

meta-ti-bsp/conf/machine/am62xx-evm.conf +1 -1
-UBOOT_MACHINE = "am62x_evm_a53_defconfig"
+UBOOT_CONFIG = "evm"
meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf +2 -7
index 52b69a72..fb760e99 100644
@@ -2,11 +2,6 @@
   #@NAME: AM62XX LP GP EVM (R5F)
   #@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core)
-require conf/machine/include/k3r5.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified-k3r5.conf
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
+UBOOT_CONFIG = "lpsk"
meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +1 -2
index e9271f5b..f7d89d68 100644
@@ -2,8 +2,7 @@
   #@NAME: AM62XX LP EVM
   #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
-require conf/machine/include/am62xx.inc
-require conf/machine/include/ti-extras.inc
+require conf/machine/am62xx-unified.conf
   KERNEL_DEVICETREE_PREFIX = " \
       ti/k3-am62-lp \
@@ -19,4 +18,4 @@ KERNEL_DEVICETREE = " \
       ti/k3-am62x-sk-hdmi-audio.dtbo \

  "

meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +1 -1
-UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
+UBOOT_CONFIG = "lpsk"
meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf new file +20 -0
new file mode 100644
index 00000000..7d65e6af
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM62XX EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+require conf/machine/include/ti-extras.inc
+
+SYSFW_SOC = "am62x"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = ""
+# Last config in the list is default
+UBOOT_CONFIG ??= "sip lpsk evm"
+
+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"
meta-ti-bsp/conf/machine/am62xx-unified.conf new file +3 -0
new file mode 100644
index 00000000..5b03239f
@@ -0,0 +1,43 @@
+#@TYPE: Machine
+#@NAME: AM62XX Unified EVM
+#@DESCRIPTION: Machine configuration for the TI AM62XX EVM and all 

of its variations

meta-ti-bsp/conf/machine/am62xx-unified.conf new file +40 -0
+
+require conf/machine/include/am62xx.inc
+require conf/machine/include/ti-extras.inc
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am62-lp \
+    ti/k3-am625 \
+    ti/k3-am62x-sk \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am62-lp-sk.dtb \
+    ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
+    ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
+    ti/k3-am625-beagleplay.dtb \
+    ti/k3-am625-phyboard-lyra-rdk.dtb \
+    ti/k3-am625-sk.dtb \
+    ti/k3-am625-verdin-nonwifi-dahlia.dtb \
+    ti/k3-am625-verdin-nonwifi-dev.dtb \
+    ti/k3-am625-verdin-nonwifi-mallow.dtb \
+    ti/k3-am625-verdin-nonwifi-yavia.dtb \
+    ti/k3-am625-verdin-wifi-dahlia.dtb \
+    ti/k3-am625-verdin-wifi-dev.dtb \
+    ti/k3-am625-verdin-wifi-mallow.dtb \
+    ti/k3-am625-verdin-wifi-yavia.dtb \
+    ti/k3-am62x-sk-csi2-imx219.dtbo \
+    ti/k3-am62x-sk-csi2-ov5640.dtbo \
+    ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
+    ti/k3-am62x-sk-hdmi-audio.dtbo \
+"
+
+UBOOT_MACHINE = ""
+# Last config in the list is default
+UBOOT_CONFIG ??= "sip lpsk evm"
+
+UBOOT_CONFIG:bsp-ti-6_1 ??= "lpsk evm"
+
+UBOOT_CONFIG[sip] = "am62xsip_evm_a53_defconfig"
+UBOOT_CONFIG[lpsk] = "am62x_lpsk_a53_defconfig"
+UBOOT_CONFIG[evm] = "am62x_evm_a53_defconfig"
meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf +3 -5
index 55bc530b..ab538ff3 100644
@@ -2,13 +2,11 @@
   #@NAME: AM62XX SIP EVM (R5F)
   #@DESCRIPTION: Machine configuration for the TI AM62xx SIP EVM (R5F core)
-require conf/machine/include/k3r5.inc
+require conf/machine/am62xx-unified-k3r5.conf
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
+UBOOT_CONFIG = "sip"
-UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
+UBOOT_CONFIG:bsp-ti-6_1 = ""

  UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"

meta-ti-bsp/conf/machine/am62xxsip-evm.conf +1 -1
index 8104329e..6b179b80 100644
@@ -2,7 +2,7 @@
   #@NAME: AM62XX SIP EVM
   #@DESCRIPTION: Machine configuration for the TI AM62XX SIP EVM
-require conf/machine/include/am62xx.inc
+require conf/machine/am62xx-unified.conf
   KERNEL_DEVICETREE_PREFIX = " \
       ti/k3-am625 \
@@ -13,6 +13,4 @@ KERNEL_DEVICETREE = " \
       ti/k3-am625-sk.dtb \

  "

meta-ti-bsp/conf/machine/am62xxsip-evm.conf +0 -2
-UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
-
Quoted 8 lines
Quoted 8 lines
meta-ti-bsp/conf/machine/am62xxsip-evm.conf +1 -1
-UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"
+UBOOT_CONFIG = "sip"
Signature · 1 line
2.17.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#17937): https://lists.yoctoproject.org/g/meta-ti/message/17937
Mute This Topic: https://lists.yoctoproject.org/mt/107796202/6551054
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-