Skip to contentSkip to conversation

conf: machine: add AM69-SK machine configuration

PATCH In review Aniket Limaye 3 participants 9 messages Apr 24, 2024 – Apr 29, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 conf: machine: add AM69-SK machine configuration

From: Beleswar Padhi <[email protected]>

As of commits [1] and [2] in ti-u-boot-2024.04 and upstream respectively there is a separate defconfig to build u-boot for j784s4-evm and am69-sk

Hence, introduce new yocto machine configs for am69-sk. Also remove am69 devicetree builds from the j784s4-evm conf

[1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2024.04&id=8a46af7a39e6218e4de5c6195697af36201c778c
[2]: https://source.denx.de/u-boot/u-boot/-/commit/740759d558e632e1540d620baadbcc46fdf24db2

---
 meta-ti-bsp/conf/machine/am69-sk-k3r5.conf | 11 +++++++++++
 meta-ti-bsp/conf/machine/am69-sk.conf      | 20 ++++++++++++++++++++
 meta-ti-bsp/conf/machine/j784s4-evm.conf   |  1 -
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
 create mode 100644 meta-ti-bsp/conf/machine/am69-sk.conf
meta-ti-bsp/conf/machine/am69-sk-k3r5.conf new file +11 -0
new file mode 100644
index 00000000..9d2b4cd6
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: AM69 SK (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM69 SK (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j784s4"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am69_sk_r5_defconfig"
meta-ti-bsp/conf/machine/am69-sk.conf new file +20 -0
new file mode 100644
index 00000000..233a4618
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM69 SK
+#@DESCRIPTION: Machine configuration for the TI AM69 SK
+
+require conf/machine/include/j784s4.inc
+
+TFA_K3_USART = "0x8"
+OPTEE_K3_USART = "0x8"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am69-sk \
+    ti/k3-fpdlink \
+    ti/k3-v3link \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am69-sk.dtb \
+"
+
+UBOOT_MACHINE = "am69_sk_a72_defconfig"
meta-ti-bsp/conf/machine/j784s4-evm.conf +0 -1
index e451bf47..6573e5c5 100644
@@ -11,7 +11,6 @@ KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-j784s4 \
     ti/k3-fpdlink \
     ti/k3-j7200-evm-mcspi-loopback \
-    ti/k3-am69-sk \
     ti/k3-v3link \
 "
 
Signature · 1 line
2.34.1
#1 lore raw

We have consistently named the machines with -evm and not -sk. Is there a good reason to not name this am69-evm?

Quoted 76 lines · Aniket Limaye

From: Beleswar Padhi <[email protected]>

As of commits [1] and [2] in ti-u-boot-2024.04 and upstream respectively there is a separate defconfig to build u-boot for j784s4-evm and am69-sk

Hence, introduce new yocto machine configs for am69-sk. Also remove am69 devicetree builds from the j784s4-evm conf

[1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2024.04&id=8a46af7a39e6218e4de5c6195697af36201c778c
[2]: https://source.denx.de/u-boot/u-boot/-/commit/740759d558e632e1540d620baadbcc46fdf24db2

---
  meta-ti-bsp/conf/machine/am69-sk-k3r5.conf | 11 +++++++++++
  meta-ti-bsp/conf/machine/am69-sk.conf      | 20 ++++++++++++++++++++
  meta-ti-bsp/conf/machine/j784s4-evm.conf   |  1 -
  3 files changed, 31 insertions(+), 1 deletion(-)

create mode 100644 meta-ti-bsp/conf/machine/am69-sk-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am69-sk.conf

meta-ti-bsp/conf/machine/am69-sk-k3r5.conf new file +11 -0
new file mode 100644
index 00000000..9d2b4cd6
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: AM69 SK (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM69 SK (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j784s4"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am69_sk_r5_defconfig"
meta-ti-bsp/conf/machine/am69-sk.conf new file +20 -0
new file mode 100644
index 00000000..233a4618
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM69 SK
+#@DESCRIPTION: Machine configuration for the TI AM69 SK
+
+require conf/machine/include/j784s4.inc
+
+TFA_K3_USART = "0x8"
+OPTEE_K3_USART = "0x8"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am69-sk \
+    ti/k3-fpdlink \
+    ti/k3-v3link \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am69-sk.dtb \
+"
+
+UBOOT_MACHINE = "am69_sk_a72_defconfig"
meta-ti-bsp/conf/machine/j784s4-evm.conf +0 -1
index e451bf47..6573e5c5 100644
@@ -11,7 +11,6 @@ KERNEL_DEVICETREE_PREFIX = " \
      ti/k3-j784s4 \
      ti/k3-fpdlink \
      ti/k3-j7200-evm-mcspi-loopback \
-    ti/k3-am69-sk \
      ti/k3-v3link \
  "
 
Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
#2 lore raw
Quoted 3 lines · Ryan Eatmon

We have consistently named the machines with -evm and not -sk.  Is there a good reason to not name this am69-evm?

Well this is just following the naming convention that got accepted in u-boot:

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

Yeah other parts have been like "am62x_evm_*_defconfig" and such, but for am69 we have gone with "am69_sk_*_defconfig"

Even the dts files for these, everywhere, have -sk suffixes.

Hence the change here as well.

Regards,
Aniket

Quoted 79 lines · Aniket Limaye
Quoted 75 lines

From: Beleswar Padhi <[email protected]>

As of commits [1] and [2] in ti-u-boot-2024.04 and upstream respectively there is a separate defconfig to build u-boot for j784s4-evm and am69-sk

Hence, introduce new yocto machine configs for am69-sk. Also remove am69 devicetree builds from the j784s4-evm conf

[1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2024.04&id=8a46af7a39e6218e4de5c6195697af36201c778c
[2]: https://source.denx.de/u-boot/u-boot/-/commit/740759d558e632e1540d620baadbcc46fdf24db2

---
  meta-ti-bsp/conf/machine/am69-sk-k3r5.conf | 11 +++++++++++ meta-ti-bsp/conf/machine/am69-sk.conf      | 20 ++++++++++++++++++++ meta-ti-bsp/conf/machine/j784s4-evm.conf   |  1 -

  3 files changed, 31 insertions(+), 1 deletion(-)

  create mode 100644 meta-ti-bsp/conf/machine/am69-sk-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am69-sk.conf

meta-ti-bsp/conf/machine/am69-sk-k3r5.conf new file +11 -0
new file mode 100644
index 00000000..9d2b4cd6
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: AM69 SK (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM69 SK (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j784s4"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am69_sk_r5_defconfig"
meta-ti-bsp/conf/machine/am69-sk.conf new file +20 -0
new file mode 100644
index 00000000..233a4618
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM69 SK
+#@DESCRIPTION: Machine configuration for the TI AM69 SK
+
+require conf/machine/include/j784s4.inc
+
+TFA_K3_USART = "0x8"
+OPTEE_K3_USART = "0x8"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am69-sk \
+    ti/k3-fpdlink \
+    ti/k3-v3link \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am69-sk.dtb \
+"
+
+UBOOT_MACHINE = "am69_sk_a72_defconfig"
meta-ti-bsp/conf/machine/j784s4-evm.conf +0 -1
index e451bf47..6573e5c5 100644
@@ -11,7 +11,6 @@ KERNEL_DEVICETREE_PREFIX = " \
       ti/k3-j784s4 \
       ti/k3-fpdlink \
       ti/k3-j7200-evm-mcspi-loopback \
-    ti/k3-am69-sk \
       ti/k3-v3link \

  "

#3 lore raw
Quoted 6 lines · Aniket
Quoted 3 lines · Ryan Eatmon

We have consistently named the machines with -evm and not -sk.  Is there a good reason to not name this am69-evm?

Well this is just following the naming convention that got accepted in u-boot:

Quoted 7 lines

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

Yeah other parts have been like "am62x_evm_*_defconfig" and such, but for am69 we have gone with "am69_sk_*_defconfig"

Even the dts files for these, everywhere, have -sk suffixes.

Hence the change here as well.

Just because the configs in uboot have sk does not imply that the machine name in meta-ti needs to have sk. From my understanding, generally the sk comes first and latest a full up evm. But the Yocto machine usually supports all of the variations and so they were named with -evm to be the broadest possible name.

My personal preference would be to eliminate the -evm for all of the machines and just go with the soc name. But if we are going to have it then I think they should be consistent.

Quoted 82 lines

Regards,
Aniket

Quoted 79 lines · Aniket Limaye
Quoted 75 lines

From: Beleswar Padhi <[email protected]>

As of commits [1] and [2] in ti-u-boot-2024.04 and upstream respectively there is a separate defconfig to build u-boot for j784s4-evm and am69-sk

Hence, introduce new yocto machine configs for am69-sk. Also remove am69 devicetree builds from the j784s4-evm conf

[1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2024.04&id=8a46af7a39e6218e4de5c6195697af36201c778c
[2]: https://source.denx.de/u-boot/u-boot/-/commit/740759d558e632e1540d620baadbcc46fdf24db2

---
  meta-ti-bsp/conf/machine/am69-sk-k3r5.conf | 11 +++++++++++ meta-ti-bsp/conf/machine/am69-sk.conf      | 20 ++++++++++++++++++++ meta-ti-bsp/conf/machine/j784s4-evm.conf   |  1 -

  3 files changed, 31 insertions(+), 1 deletion(-)

  create mode 100644 meta-ti-bsp/conf/machine/am69-sk-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am69-sk.conf

meta-ti-bsp/conf/machine/am69-sk-k3r5.conf new file +11 -0
new file mode 100644
index 00000000..9d2b4cd6
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: AM69 SK (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM69 SK (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j784s4"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am69_sk_r5_defconfig"
meta-ti-bsp/conf/machine/am69-sk.conf new file +20 -0
new file mode 100644
index 00000000..233a4618
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM69 SK
+#@DESCRIPTION: Machine configuration for the TI AM69 SK
+
+require conf/machine/include/j784s4.inc
+
+TFA_K3_USART = "0x8"
+OPTEE_K3_USART = "0x8"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am69-sk \
+    ti/k3-fpdlink \
+    ti/k3-v3link \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am69-sk.dtb \
+"
+
+UBOOT_MACHINE = "am69_sk_a72_defconfig"
meta-ti-bsp/conf/machine/j784s4-evm.conf +0 -1
index e451bf47..6573e5c5 100644
@@ -11,7 +11,6 @@ KERNEL_DEVICETREE_PREFIX = " \
       ti/k3-j784s4 \
       ti/k3-fpdlink \
       ti/k3-j7200-evm-mcspi-loopback \
-    ti/k3-am69-sk \
       ti/k3-v3link \

  "

Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
#4 lore raw
Quoted 20 lines · Ryan Eatmon via lists.yoctoproject.org
Quoted 8 lines · Aniket
Quoted 4 lines · Ryan Eatmon

We have consistently named the machines with -evm and not -sk. Is there a good reason to not name this am69-evm?

Well this is just following the naming convention that got accepted in u-boot:

Quoted 8 lines

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

Yeah other parts have been like "am62x_evm_*_defconfig" and such, but for am69 we have gone with "am69_sk_*_defconfig"

Even the dts files for these, everywhere, have -sk suffixes.

Hence the change here as well.

Quoted 8 lines

Just because the configs in uboot have sk does not imply that the machine name in meta-ti needs to have sk. From my understanding, generally the sk comes first and latest a full up evm. But the Yocto machine usually supports all of the variations and so they were named with -evm to be the broadest possible name.

My personal preference would be to eliminate the -evm for all of the machines and just go with the soc name.

Just make sure that won't conflict with the SoC family name, as currently the part of the machine name w/o -evm is what's used for SoC name...

Quoted 89 lines

But if we are going to have
it then I think they should be consistent.

Quoted 85 lines

Regards,
Aniket

Quoted 82 lines · Aniket Limaye
Quoted 78 lines

From: Beleswar Padhi <[email protected]>

As of commits [1] and [2] in ti-u-boot-2024.04 and upstream respectively there is a separate defconfig to build u-boot for j784s4-evm and am69-sk

Hence, introduce new yocto machine configs for am69-sk. Also remove am69 devicetree builds from the j784s4-evm conf

[1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2024.04&id=8a46af7a39e6218e4de5c6195697af36201c778c
[2]: https://source.denx.de/u-boot/u-boot/-/commit/740759d558e632e1540d620baadbcc46fdf24db2

---
  meta-ti-bsp/conf/machine/am69-sk-k3r5.conf | 11 +++++++++++ meta-ti-bsp/conf/machine/am69-sk.conf      | 20 ++++++++++++++++++++ meta-ti-bsp/conf/machine/j784s4-evm.conf   |  1 -

  3 files changed, 31 insertions(+), 1 deletion(-)

  create mode 100644 meta-ti-bsp/conf/machine/am69-sk-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am69-sk.conf

meta-ti-bsp/conf/machine/am69-sk-k3r5.conf new file +11 -0
new file mode 100644
index 00000000..9d2b4cd6
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: AM69 SK (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM69 SK (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j784s4"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am69_sk_r5_defconfig"
meta-ti-bsp/conf/machine/am69-sk.conf new file +20 -0
new file mode 100644
index 00000000..233a4618
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM69 SK
+#@DESCRIPTION: Machine configuration for the TI AM69 SK
+
+require conf/machine/include/j784s4.inc
+
+TFA_K3_USART = "0x8"
+OPTEE_K3_USART = "0x8"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am69-sk \
+    ti/k3-fpdlink \
+    ti/k3-v3link \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am69-sk.dtb \
+"
+
+UBOOT_MACHINE = "am69_sk_a72_defconfig"
meta-ti-bsp/conf/machine/j784s4-evm.conf +0 -1
index e451bf47..6573e5c5 100644
@@ -11,7 +11,6 @@ KERNEL_DEVICETREE_PREFIX = " \
       ti/k3-j784s4 \
       ti/k3-fpdlink \
       ti/k3-j7200-evm-mcspi-loopback \
-    ti/k3-am69-sk \
       ti/k3-v3link \

  "

#5 lore raw
Quoted 27 lines · Denys Dmytriyenko
Quoted 26 lines · Ryan Eatmon via lists.yoctoproject.org
Quoted 8 lines · Aniket
Quoted 4 lines · Ryan Eatmon

We have consistently named the machines with -evm and not -sk. Is there a good reason to not name this am69-evm?

Well this is just following the naming convention that got accepted in u-boot:

Quoted 8 lines

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

Yeah other parts have been like "am62x_evm_*_defconfig" and such, but for am69 we have gone with "am69_sk_*_defconfig"

Even the dts files for these, everywhere, have -sk suffixes.

Hence the change here as well.

Just because the configs in uboot have sk does not imply that the machine name in meta-ti needs to have sk. From my understanding, generally the sk comes first and latest a full up evm. But the Yocto machine usually supports all of the variations and so they were named with -evm to be the broadest possible name.

Quoted 5 lines
Quoted 2 lines

My personal preference would be to eliminate the -evm for all of the machines and just go with the soc name.

Just make sure that won't conflict with the SoC family name, as currently the part of the machine name w/o -evm is what's used for SoC name...

Good point. I didn't say my preference was fleshed out... =)

Quoted 90 lines
Quoted 90 lines

But if we are going to have
it then I think they should be consistent.

Quoted 85 lines

Regards,
Aniket

Quoted 82 lines · Aniket Limaye
Quoted 78 lines

From: Beleswar Padhi <[email protected]>

As of commits [1] and [2] in ti-u-boot-2024.04 and upstream respectively there is a separate defconfig to build u-boot for j784s4-evm and am69-sk

Hence, introduce new yocto machine configs for am69-sk. Also remove am69 devicetree builds from the j784s4-evm conf

[1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2024.04&id=8a46af7a39e6218e4de5c6195697af36201c778c
[2]: https://source.denx.de/u-boot/u-boot/-/commit/740759d558e632e1540d620baadbcc46fdf24db2

---
   meta-ti-bsp/conf/machine/am69-sk-k3r5.conf | 11 +++++++++++
   meta-ti-bsp/conf/machine/am69-sk.conf      | 20 ++++++++++++++++++++
   meta-ti-bsp/conf/machine/j784s4-evm.conf   |  1 -
   3 files changed, 31 insertions(+), 1 deletion(-)

  create mode 100644 meta-ti-bsp/conf/machine/am69-sk-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am69-sk.conf

meta-ti-bsp/conf/machine/am69-sk-k3r5.conf new file +11 -0
new file mode 100644
index 00000000..9d2b4cd6
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: AM69 SK (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM69 SK (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j784s4"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am69_sk_r5_defconfig"
meta-ti-bsp/conf/machine/am69-sk.conf new file +20 -0
new file mode 100644
index 00000000..233a4618
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM69 SK
+#@DESCRIPTION: Machine configuration for the TI AM69 SK
+
+require conf/machine/include/j784s4.inc
+
+TFA_K3_USART = "0x8"
+OPTEE_K3_USART = "0x8"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am69-sk \
+    ti/k3-fpdlink \
+    ti/k3-v3link \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am69-sk.dtb \
+"
+
+UBOOT_MACHINE = "am69_sk_a72_defconfig"
meta-ti-bsp/conf/machine/j784s4-evm.conf +0 -1
index e451bf47..6573e5c5 100644
@@ -11,7 +11,6 @@ KERNEL_DEVICETREE_PREFIX = " \
       ti/k3-j784s4 \
       ti/k3-fpdlink \
       ti/k3-j7200-evm-mcspi-loopback \
-    ti/k3-am69-sk \
       ti/k3-v3link \
   "
Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
#6 lore raw
In reply to Ryan Eatmon
Quoted 12 lines · Ryan Eatmon
Quoted 9 lines · Aniket
Quoted 3 lines · Ryan Eatmon

We have consistently named the machines with -evm and not -sk.  Is there a good reason to not name this am69-evm?

Well this is just following the naming convention that got accepted in u-boot:

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

Quoted 8 lines
Quoted 5 lines

Yeah other parts have been like "am62x_evm_*_defconfig" and such, but for am69 we have gone with "am69_sk_*_defconfig"

Even the dts files for these, everywhere, have -sk suffixes.

Hence the change here as well.

Just because the configs in uboot have sk does not imply that the machine name in meta-ti needs to have sk.  From my understanding, generally the sk comes first and latest a full up evm.  But the Yocto machine usually supports all of the variations and so they were named with -evm to be the broadest possible name.

The yocto machine did used to support all of the variations up until now, but starting the next LTS stream, the j784s4-evm build will not work for the am69-sk. U-boot will only be packing one dtb in the u-boot img, which means we require a source code / build config change between j784s4-evm and am68-sk (and all future boards with different dtbs), to be able to boot the board.

The above only explains the need for a new yocto machine for the SKs... As for the naming, everywhere on ti.com we have always used am69-*sk* as the product, including documentation. For example, [1] vs [2]. [1]: https://www.ti.com/tool/J784S4XEVM
[2]: https://www.ti.com/tool/SK-AM69

I don't think we should deviate from ti.com naming, u-boot board names, and the current public documentation, just to have consistency in meta-ti?

For future devices, we can keep using -evm as the default since those boards come first (not the corresponding SKs, not sure if it was a typo in your msg). And then add the -sk boards for the SOCs as applicable.

Quoted 1 line

My personal preference would be to eliminate the -evm for all of the machines and just go with the soc name.  But if we are going to have it then I think they should be consistent.

am69-sk and j784s4-evm will be including the same soc include (j784s4.inc), but they do need different dtbs, u-boot configs, GP/HS-FS defaults... That is to say we are configuring board specific settings in our builds for our boards. So I don't think we should move to just using the soc name.

Quoted 84 lines
Quoted 83 lines

Regards,
Aniket

Quoted 79 lines · Aniket Limaye
Quoted 75 lines

From: Beleswar Padhi <[email protected]>

As of commits [1] and [2] in ti-u-boot-2024.04 and upstream respectively there is a separate defconfig to build u-boot for j784s4-evm and am69-sk

Hence, introduce new yocto machine configs for am69-sk. Also remove am69 devicetree builds from the j784s4-evm conf

[1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2024.04&id=8a46af7a39e6218e4de5c6195697af36201c778c
[2]: https://source.denx.de/u-boot/u-boot/-/commit/740759d558e632e1540d620baadbcc46fdf24db2

---
  meta-ti-bsp/conf/machine/am69-sk-k3r5.conf | 11 +++++++++++ meta-ti-bsp/conf/machine/am69-sk.conf      | 20 ++++++++++++++++++++ meta-ti-bsp/conf/machine/j784s4-evm.conf   |  1 -

  3 files changed, 31 insertions(+), 1 deletion(-)

  create mode 100644 meta-ti-bsp/conf/machine/am69-sk-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am69-sk.conf

meta-ti-bsp/conf/machine/am69-sk-k3r5.conf new file +11 -0
new file mode 100644
index 00000000..9d2b4cd6
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: AM69 SK (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM69 SK (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j784s4"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am69_sk_r5_defconfig"
meta-ti-bsp/conf/machine/am69-sk.conf new file +20 -0
new file mode 100644
index 00000000..233a4618
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM69 SK
+#@DESCRIPTION: Machine configuration for the TI AM69 SK
+
+require conf/machine/include/j784s4.inc
+
+TFA_K3_USART = "0x8"
+OPTEE_K3_USART = "0x8"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am69-sk \
+    ti/k3-fpdlink \
+    ti/k3-v3link \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am69-sk.dtb \
+"
+
+UBOOT_MACHINE = "am69_sk_a72_defconfig"
meta-ti-bsp/conf/machine/j784s4-evm.conf +0 -1
index e451bf47..6573e5c5 100644
@@ -11,7 +11,6 @@ KERNEL_DEVICETREE_PREFIX = " \
       ti/k3-j784s4 \
       ti/k3-fpdlink \
       ti/k3-j7200-evm-mcspi-loopback \
-    ti/k3-am69-sk \
       ti/k3-v3link \

  "

#7 lore raw
Quoted 27 lines · Aniket
Quoted 11 lines · Ryan Eatmon
Quoted 8 lines · Aniket
Quoted 3 lines · Ryan Eatmon

We have consistently named the machines with -evm and not -sk.  Is there a good reason to not name this am69-evm?

Well this is just following the naming convention that got accepted in u-boot:

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

Quoted 8 lines
Quoted 5 lines

Yeah other parts have been like "am62x_evm_*_defconfig" and such, but for am69 we have gone with "am69_sk_*_defconfig"

Even the dts files for these, everywhere, have -sk suffixes.

Hence the change here as well.

Just because the configs in uboot have sk does not imply that the machine name in meta-ti needs to have sk.  From my understanding, generally the sk comes first and latest a full up evm.  But the Yocto machine usually supports all of the variations and so they were named with -evm to be the broadest possible name.

The yocto machine did used to support all of the variations up until now, but starting the next LTS stream, the j784s4-evm build will not work for the am69-sk. U-boot will only be packing one dtb in the u-boot img, which means we require a source code / build config change between j784s4-evm and am68-sk (and all future boards with different dtbs), to be able to boot the board.

The above only explains the need for a new yocto machine for the SKs... As for the naming, everywhere on ti.com we have always used am69-*sk* as the product, including documentation. For example, [1] vs [2]. [1]: https://www.ti.com/tool/J784S4XEVM
[2]: https://www.ti.com/tool/SK-AM69

Quoted 7 lines

I don't think we should deviate from ti.com naming, u-boot board names, and the current public documentation, just to have consistency in meta-ti?

For future devices, we can keep using -evm as the default since those boards come first (not the corresponding SKs, not sure if it was a typo in your msg). And then add the -sk boards for the SOCs as applicable.

Quoted 1 line

My personal preference would be to eliminate the -evm for all of the machines and just go with the soc name.  But if we are going to have it then I think they should be consistent.

am69-sk and j784s4-evm will be including the same soc include (j784s4.inc), but they do need different dtbs, u-boot configs, GP/HS-FS defaults... That is to say we are configuring board specific settings in our builds for our boards. So I don't think we should move to just using the soc name.

I'm still not happy about introducing the inconsistency, but I'll accept this patch for now and work on a better longer term solution for the machine naming that can be both high level (multi-board support) and low level (single board support).

I have some ideas on that, I just need time to put together an RFC so that we can have a larger discussion.

Quoted 84 lines
Quoted 84 lines
Quoted 83 lines

Regards,
Aniket

Quoted 79 lines · Aniket Limaye
Quoted 75 lines

From: Beleswar Padhi <[email protected]>

As of commits [1] and [2] in ti-u-boot-2024.04 and upstream respectively there is a separate defconfig to build u-boot for j784s4-evm and am69-sk

Hence, introduce new yocto machine configs for am69-sk. Also remove am69 devicetree builds from the j784s4-evm conf

[1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2024.04&id=8a46af7a39e6218e4de5c6195697af36201c778c
[2]: https://source.denx.de/u-boot/u-boot/-/commit/740759d558e632e1540d620baadbcc46fdf24db2

---
  meta-ti-bsp/conf/machine/am69-sk-k3r5.conf | 11 +++++++++++ meta-ti-bsp/conf/machine/am69-sk.conf      | 20 ++++++++++++++++++++ meta-ti-bsp/conf/machine/j784s4-evm.conf   |  1 -

  3 files changed, 31 insertions(+), 1 deletion(-)

  create mode 100644 meta-ti-bsp/conf/machine/am69-sk-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am69-sk.conf

meta-ti-bsp/conf/machine/am69-sk-k3r5.conf new file +11 -0
new file mode 100644
index 00000000..9d2b4cd6
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: AM69 SK (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM69 SK (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j784s4"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am69_sk_r5_defconfig"
meta-ti-bsp/conf/machine/am69-sk.conf new file +20 -0
new file mode 100644
index 00000000..233a4618
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM69 SK
+#@DESCRIPTION: Machine configuration for the TI AM69 SK
+
+require conf/machine/include/j784s4.inc
+
+TFA_K3_USART = "0x8"
+OPTEE_K3_USART = "0x8"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am69-sk \
+    ti/k3-fpdlink \
+    ti/k3-v3link \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am69-sk.dtb \
+"
+
+UBOOT_MACHINE = "am69_sk_a72_defconfig"
meta-ti-bsp/conf/machine/j784s4-evm.conf +0 -1
index e451bf47..6573e5c5 100644
@@ -11,7 +11,6 @@ KERNEL_DEVICETREE_PREFIX = " \
       ti/k3-j784s4 \
       ti/k3-fpdlink \
       ti/k3-j7200-evm-mcspi-loopback \
-    ti/k3-am69-sk \
       ti/k3-v3link \

  "

Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
#8 lore raw
Quoted 35 lines · Ryan Eatmon
Quoted 32 lines · Aniket
Quoted 12 lines · Ryan Eatmon
Quoted 9 lines · Aniket
Quoted 3 lines · Ryan Eatmon

We have consistently named the machines with -evm and not -sk.  Is there a good reason to not name this am69-evm?

Well this is just following the naming convention that got accepted in u-boot:

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

Quoted 8 lines
Quoted 5 lines

Yeah other parts have been like "am62x_evm_*_defconfig" and such, but for am69 we have gone with "am69_sk_*_defconfig"

Even the dts files for these, everywhere, have -sk suffixes.

Hence the change here as well.

Just because the configs in uboot have sk does not imply that the machine name in meta-ti needs to have sk.  From my understanding, generally the sk comes first and latest a full up evm.  But the Yocto machine usually supports all of the variations and so they were named with -evm to be the broadest possible name.

The yocto machine did used to support all of the variations up until now, but starting the next LTS stream, the j784s4-evm build will not work for the am69-sk. U-boot will only be packing one dtb in the u-boot img, which means we require a source code / build config change between j784s4-evm and am68-sk (and all future boards with different dtbs), to be able to boot the board.

The above only explains the need for a new yocto machine for the SKs... As for the naming, everywhere on ti.com we have always used am69-*sk* as the product, including documentation. For example, [1] vs [2]. [1]: https://www.ti.com/tool/J784S4XEVM
[2]: https://www.ti.com/tool/SK-AM69

I don't think we should deviate from ti.com naming, u-boot board names, and the current public documentation, just to have consistency in meta-ti?

For future devices, we can keep using -evm as the default since those boards come first (not the corresponding SKs, not sure if it was a typo in your msg). And then add the -sk boards for the SOCs as applicable.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

My personal preference would be to eliminate the -evm for all of the machines and just go with the soc name.  But if we are going to have it then I think they should be consistent.

am69-sk and j784s4-evm will be including the same soc include (j784s4.inc), but they do need different dtbs, u-boot configs, GP/HS-FS defaults... That is to say we are configuring board specific settings in our builds for our boards. So I don't think we should move to just using the soc name.

I'm still not happy about introducing the inconsistency, but I'll accept this patch for now and work on a better longer term solution for the machine naming that can be both high level (multi-board support) and low level (single board support).

I have some ideas on that, I just need time to put together an RFC so that we can have a larger discussion.

Oh, that sounds good...
Will check it out when ready!

Thanks,
Aniket

Quoted 88 lines
Quoted 87 lines
Quoted 87 lines
Quoted 86 lines

Regards,
Aniket

Quoted 80 lines · Aniket Limaye
Quoted 76 lines

From: Beleswar Padhi <[email protected]>

As of commits [1] and [2] in ti-u-boot-2024.04 and upstream respectively there is a separate defconfig to build u-boot for j784s4-evm and am69-sk

Hence, introduce new yocto machine configs for am69-sk. Also remove am69 devicetree builds from the j784s4-evm conf

[1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/commit/?h=ti-u-boot-2024.04&id=8a46af7a39e6218e4de5c6195697af36201c778c
[2]: https://source.denx.de/u-boot/u-boot/-/commit/740759d558e632e1540d620baadbcc46fdf24db2

---
  meta-ti-bsp/conf/machine/am69-sk-k3r5.conf | 11 +++++++++++ meta-ti-bsp/conf/machine/am69-sk.conf      | 20
++++++++++++++++++++
  meta-ti-bsp/conf/machine/j784s4-evm.conf   |  1 -

  3 files changed, 31 insertions(+), 1 deletion(-)

  create mode 100644 meta-ti-bsp/conf/machine/am69-sk-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am69-sk.conf

meta-ti-bsp/conf/machine/am69-sk-k3r5.conf new file +11 -0
new file mode 100644
index 00000000..9d2b4cd6
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: AM69 SK (R5F)
+#@DESCRIPTION: Machine configuration for the TI AM69 SK (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j784s4"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs-fs"
+
+UBOOT_MACHINE = "am69_sk_r5_defconfig"
meta-ti-bsp/conf/machine/am69-sk.conf new file +20 -0
new file mode 100644
index 00000000..233a4618
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: AM69 SK
+#@DESCRIPTION: Machine configuration for the TI AM69 SK
+
+require conf/machine/include/j784s4.inc
+
+TFA_K3_USART = "0x8"
+OPTEE_K3_USART = "0x8"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am69-sk \
+    ti/k3-fpdlink \
+    ti/k3-v3link \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am69-sk.dtb \
+"
+
+UBOOT_MACHINE = "am69_sk_a72_defconfig"
meta-ti-bsp/conf/machine/j784s4-evm.conf +0 -1
index e451bf47..6573e5c5 100644
@@ -11,7 +11,6 @@ KERNEL_DEVICETREE_PREFIX = " \
       ti/k3-j784s4 \
       ti/k3-fpdlink \
       ti/k3-j7200-evm-mcspi-loopback \
-    ti/k3-am69-sk \
       ti/k3-v3link \

  "