diff mbox series

[meta-ti,master/scarthgap] conf: machine: add AM69-SK machine configuration

Message ID 20240424083546.2190336-1-a-limaye@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [meta-ti,master/scarthgap] conf: machine: add AM69-SK machine configuration | expand

Commit Message

Limaye, Aniket April 24, 2024, 8:35 a.m. UTC
From: Beleswar Padhi <b-padhi@ti.com>

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

Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
Signed-off-by: Aniket Limaye <a-limaye@ti.com>
---
 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

Comments

Ryan Eatmon April 24, 2024, 1:23 p.m. UTC | #1
We have consistently named the machines with -evm and not -sk.  Is there 
a good reason to not name this am69-evm?



On 4/24/2024 3:35 AM, Aniket Limaye wrote:
> From: Beleswar Padhi <b-padhi@ti.com>
> 
> 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
> 
> Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
> Signed-off-by: Aniket Limaye <a-limaye@ti.com>
> ---
>   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
> 
> diff --git a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
> new file mode 100644
> index 00000000..9d2b4cd6
> --- /dev/null
> +++ b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
> @@ -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"
> diff --git a/meta-ti-bsp/conf/machine/am69-sk.conf b/meta-ti-bsp/conf/machine/am69-sk.conf
> new file mode 100644
> index 00000000..233a4618
> --- /dev/null
> +++ b/meta-ti-bsp/conf/machine/am69-sk.conf
> @@ -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"
> diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
> index e451bf47..6573e5c5 100644
> --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
> +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
> @@ -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 \
>   "
>
Limaye, Aniket April 25, 2024, 3:59 a.m. UTC | #2
On 4/24/2024 6:53 PM, Ryan Eatmon wrote:
>
> 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

>
>
> On 4/24/2024 3:35 AM, Aniket Limaye wrote:
>> From: Beleswar Padhi <b-padhi@ti.com>
>>
>> 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
>>
>> Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
>> Signed-off-by: Aniket Limaye <a-limaye@ti.com>
>> ---
>>   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
>>
>> diff --git a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf 
>> b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
>> new file mode 100644
>> index 00000000..9d2b4cd6
>> --- /dev/null
>> +++ b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
>> @@ -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"
>> diff --git a/meta-ti-bsp/conf/machine/am69-sk.conf 
>> b/meta-ti-bsp/conf/machine/am69-sk.conf
>> new file mode 100644
>> index 00000000..233a4618
>> --- /dev/null
>> +++ b/meta-ti-bsp/conf/machine/am69-sk.conf
>> @@ -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"
>> diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf 
>> b/meta-ti-bsp/conf/machine/j784s4-evm.conf
>> index e451bf47..6573e5c5 100644
>> --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
>> +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
>> @@ -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 \
>>   "
>
Ryan Eatmon April 25, 2024, 7:36 p.m. UTC | #3
On 4/24/2024 10:59 PM, Limaye, Aniket wrote:
> On 4/24/2024 6:53 PM, Ryan Eatmon wrote:
>>
>> 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.

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.


> Regards,
> Aniket
> 
>>
>>
>> On 4/24/2024 3:35 AM, Aniket Limaye wrote:
>>> From: Beleswar Padhi <b-padhi@ti.com>
>>>
>>> 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
>>>
>>> Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
>>> Signed-off-by: Aniket Limaye <a-limaye@ti.com>
>>> ---
>>>   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
>>>
>>> diff --git a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf 
>>> b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
>>> new file mode 100644
>>> index 00000000..9d2b4cd6
>>> --- /dev/null
>>> +++ b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
>>> @@ -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"
>>> diff --git a/meta-ti-bsp/conf/machine/am69-sk.conf 
>>> b/meta-ti-bsp/conf/machine/am69-sk.conf
>>> new file mode 100644
>>> index 00000000..233a4618
>>> --- /dev/null
>>> +++ b/meta-ti-bsp/conf/machine/am69-sk.conf
>>> @@ -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"
>>> diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf 
>>> b/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>> index e451bf47..6573e5c5 100644
>>> --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>> +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>> @@ -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 \
>>>   "
>>
Denys Dmytriyenko April 26, 2024, 7:01 p.m. UTC | #4
On Thu, Apr 25, 2024 at 02:36:10PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
> 
> 
> On 4/24/2024 10:59 PM, Limaye, Aniket wrote:
> >On 4/24/2024 6:53 PM, Ryan Eatmon wrote:
> >>
> >>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.
> 
> 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...


> But if we are going to have
> it then I think they should be consistent.
> 
> 
> >Regards,
> >Aniket
> >
> >>
> >>
> >>On 4/24/2024 3:35 AM, Aniket Limaye wrote:
> >>>From: Beleswar Padhi <b-padhi@ti.com>
> >>>
> >>>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
> >>>
> >>>Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
> >>>Signed-off-by: Aniket Limaye <a-limaye@ti.com>
> >>>---
> >>>  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
> >>>
> >>>diff --git a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
> >>>b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
> >>>new file mode 100644
> >>>index 00000000..9d2b4cd6
> >>>--- /dev/null
> >>>+++ b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
> >>>@@ -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"
> >>>diff --git a/meta-ti-bsp/conf/machine/am69-sk.conf
> >>>b/meta-ti-bsp/conf/machine/am69-sk.conf
> >>>new file mode 100644
> >>>index 00000000..233a4618
> >>>--- /dev/null
> >>>+++ b/meta-ti-bsp/conf/machine/am69-sk.conf
> >>>@@ -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"
> >>>diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf
> >>>b/meta-ti-bsp/conf/machine/j784s4-evm.conf
> >>>index e451bf47..6573e5c5 100644
> >>>--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
> >>>+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
> >>>@@ -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 \
> >>>  "
> >>
Ryan Eatmon April 26, 2024, 9:08 p.m. UTC | #5
On 4/26/2024 2:01 PM, Denys Dmytriyenko wrote:
> On Thu, Apr 25, 2024 at 02:36:10PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
>>
>>
>> On 4/24/2024 10:59 PM, Limaye, Aniket wrote:
>>> On 4/24/2024 6:53 PM, Ryan Eatmon wrote:
>>>>
>>>> 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.
>>
>> 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...

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

> 
>> But if we are going to have
>> it then I think they should be consistent.
>>
>>
>>> Regards,
>>> Aniket
>>>
>>>>
>>>>
>>>> On 4/24/2024 3:35 AM, Aniket Limaye wrote:
>>>>> From: Beleswar Padhi <b-padhi@ti.com>
>>>>>
>>>>> 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
>>>>>
>>>>> Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
>>>>> Signed-off-by: Aniket Limaye <a-limaye@ti.com>
>>>>> ---
>>>>>    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
>>>>>
>>>>> diff --git a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
>>>>> b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
>>>>> new file mode 100644
>>>>> index 00000000..9d2b4cd6
>>>>> --- /dev/null
>>>>> +++ b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
>>>>> @@ -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"
>>>>> diff --git a/meta-ti-bsp/conf/machine/am69-sk.conf
>>>>> b/meta-ti-bsp/conf/machine/am69-sk.conf
>>>>> new file mode 100644
>>>>> index 00000000..233a4618
>>>>> --- /dev/null
>>>>> +++ b/meta-ti-bsp/conf/machine/am69-sk.conf
>>>>> @@ -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"
>>>>> diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>>>> b/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>>>> index e451bf47..6573e5c5 100644
>>>>> --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>>>> +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>>>> @@ -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 \
>>>>>    "
>>>>
Limaye, Aniket April 29, 2024, 1:51 p.m. UTC | #6
On 4/26/2024 1:06 AM, Ryan Eatmon wrote:
>
>
> On 4/24/2024 10:59 PM, Limaye, Aniket wrote:
>> On 4/24/2024 6:53 PM, Ryan Eatmon wrote:
>>>
>>> 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.
>
> 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.

> 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.

>
>> Regards,
>> Aniket
>>
>>>
>>>
>>> On 4/24/2024 3:35 AM, Aniket Limaye wrote:
>>>> From: Beleswar Padhi <b-padhi@ti.com>
>>>>
>>>> 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
>>>>
>>>> Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
>>>> Signed-off-by: Aniket Limaye <a-limaye@ti.com>
>>>> ---
>>>>   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
>>>>
>>>> diff --git a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf 
>>>> b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
>>>> new file mode 100644
>>>> index 00000000..9d2b4cd6
>>>> --- /dev/null
>>>> +++ b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
>>>> @@ -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"
>>>> diff --git a/meta-ti-bsp/conf/machine/am69-sk.conf 
>>>> b/meta-ti-bsp/conf/machine/am69-sk.conf
>>>> new file mode 100644
>>>> index 00000000..233a4618
>>>> --- /dev/null
>>>> +++ b/meta-ti-bsp/conf/machine/am69-sk.conf
>>>> @@ -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"
>>>> diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf 
>>>> b/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>>> index e451bf47..6573e5c5 100644
>>>> --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>>> +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>>> @@ -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 \
>>>>   "
>>>
>
Ryan Eatmon April 29, 2024, 3 p.m. UTC | #7
On 4/29/2024 8:51 AM, Limaye, Aniket wrote:
> 
> On 4/26/2024 1:06 AM, Ryan Eatmon wrote:
>>
>>
>> On 4/24/2024 10:59 PM, Limaye, Aniket wrote:
>>> On 4/24/2024 6:53 PM, Ryan Eatmon wrote:
>>>>
>>>> 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.
>>
>> 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.
> 
>> 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.


>>
>>> Regards,
>>> Aniket
>>>
>>>>
>>>>
>>>> On 4/24/2024 3:35 AM, Aniket Limaye wrote:
>>>>> From: Beleswar Padhi <b-padhi@ti.com>
>>>>>
>>>>> 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
>>>>>
>>>>> Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
>>>>> Signed-off-by: Aniket Limaye <a-limaye@ti.com>
>>>>> ---
>>>>>   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
>>>>>
>>>>> diff --git a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf 
>>>>> b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
>>>>> new file mode 100644
>>>>> index 00000000..9d2b4cd6
>>>>> --- /dev/null
>>>>> +++ b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
>>>>> @@ -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"
>>>>> diff --git a/meta-ti-bsp/conf/machine/am69-sk.conf 
>>>>> b/meta-ti-bsp/conf/machine/am69-sk.conf
>>>>> new file mode 100644
>>>>> index 00000000..233a4618
>>>>> --- /dev/null
>>>>> +++ b/meta-ti-bsp/conf/machine/am69-sk.conf
>>>>> @@ -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"
>>>>> diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf 
>>>>> b/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>>>> index e451bf47..6573e5c5 100644
>>>>> --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>>>> +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>>>> @@ -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 \
>>>>>   "
>>>>
>>
Limaye, Aniket April 29, 2024, 5:56 p.m. UTC | #8
On 4/29/2024 8:30 PM, Ryan Eatmon wrote:
>
>
> On 4/29/2024 8:51 AM, Limaye, Aniket wrote:
>>
>> On 4/26/2024 1:06 AM, Ryan Eatmon wrote:
>>>
>>>
>>> On 4/24/2024 10:59 PM, Limaye, Aniket wrote:
>>>> On 4/24/2024 6:53 PM, Ryan Eatmon wrote:
>>>>>
>>>>> 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.
>>>
>>> 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.
>>
>>> 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

>
>
>>>
>>>> Regards,
>>>> Aniket
>>>>
>>>>>
>>>>>
>>>>> On 4/24/2024 3:35 AM, Aniket Limaye wrote:
>>>>>> From: Beleswar Padhi <b-padhi@ti.com>
>>>>>>
>>>>>> 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
>>>>>>
>>>>>> Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
>>>>>> Signed-off-by: Aniket Limaye <a-limaye@ti.com>
>>>>>> ---
>>>>>>   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
>>>>>>
>>>>>> diff --git a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf 
>>>>>> b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
>>>>>> new file mode 100644
>>>>>> index 00000000..9d2b4cd6
>>>>>> --- /dev/null
>>>>>> +++ b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
>>>>>> @@ -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"
>>>>>> diff --git a/meta-ti-bsp/conf/machine/am69-sk.conf 
>>>>>> b/meta-ti-bsp/conf/machine/am69-sk.conf
>>>>>> new file mode 100644
>>>>>> index 00000000..233a4618
>>>>>> --- /dev/null
>>>>>> +++ b/meta-ti-bsp/conf/machine/am69-sk.conf
>>>>>> @@ -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"
>>>>>> diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf 
>>>>>> b/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>>>>> index e451bf47..6573e5c5 100644
>>>>>> --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>>>>> +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
>>>>>> @@ -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 \
>>>>>>   "
>>>>>
>>>
>
diff mbox series

Patch

diff --git a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
new file mode 100644
index 00000000..9d2b4cd6
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf
@@ -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"
diff --git a/meta-ti-bsp/conf/machine/am69-sk.conf b/meta-ti-bsp/conf/machine/am69-sk.conf
new file mode 100644
index 00000000..233a4618
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am69-sk.conf
@@ -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"
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
index e451bf47..6573e5c5 100644
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -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 \
 "