Re: [meta-ti][master/scarthgap][PATCH v2] conf: machine: am69-sk: Create a new am69.inc file

[Andrew Davis <afd@ti.com>]

On 4/30/24 4:03 PM, Ryan Eatmon via lists.yoctoproject.org wrote:
> 
> 
> On 4/30/2024 3:47 PM, Denys Dmytriyenko wrote:
>> On Tue, Apr 30, 2024 at 02:58:11PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
>>> Reusing the j784s4.inc file presents problems as the am69-sk platform
>>> does not support GP.  So copy the j784s4.inc to am69.inc and update
>>> accordingly.
>>
>> Any chance to get this as a diff against j784s4.inc to simplify the review?
>> Maybe by playing with -C and -M options?
> 
> Here is the diff:
> 
>  > diff meta-ti-bsp/conf/machine/include/am69.inc meta-ti-bsp/conf/machine/include/j784s4.inc
> 9c9,12
> < # Default tiboot3.bin on AM69 is for SR1.0 HS-FS
> ---
>  > # Default tiboot3.bin on J784S4 is for GP
>  > IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin"

Could we include j784s4.inc from am69.inc, should be some way to remove that one
item from IMAGE_BOOT_FILES (maybe?).

Andrew

>  >
>  > # Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS
> 12c15
> < # Since default tiboot3.bin on AM69 is for HS-FS, add a version for SR1.0 HS-SE
> ---
>  > # Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-SE
> 
> 
> Effectively removing a line and changing some of the comments.
> 
> 
> 
> 
> 
>>
>>> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
>>> ---
>>> v2: Fix commit message.
>>>
>>>   meta-ti-bsp/conf/machine/am69-sk.conf     |  2 +-
>>>   meta-ti-bsp/conf/machine/include/am69.inc | 19 +++++++++++++++++++
>>>   2 files changed, 20 insertions(+), 1 deletion(-)
>>>   create mode 100644 meta-ti-bsp/conf/machine/include/am69.inc
>>>
>>> diff --git a/meta-ti-bsp/conf/machine/am69-sk.conf b/meta-ti-bsp/conf/machine/am69-sk.conf
>>> index 233a4618..6341a6fa 100644
>>> --- a/meta-ti-bsp/conf/machine/am69-sk.conf
>>> +++ b/meta-ti-bsp/conf/machine/am69-sk.conf
>>> @@ -2,7 +2,7 @@
>>>   #@NAME: AM69 SK
>>>   #@DESCRIPTION: Machine configuration for the TI AM69 SK
>>> -require conf/machine/include/j784s4.inc
>>> +require conf/machine/include/am69.inc
>>>   TFA_K3_USART = "0x8"
>>>   OPTEE_K3_USART = "0x8"
>>> diff --git a/meta-ti-bsp/conf/machine/include/am69.inc b/meta-ti-bsp/conf/machine/include/am69.inc
>>> new file mode 100644
>>> index 00000000..81be1397
>>> --- /dev/null
>>> +++ b/meta-ti-bsp/conf/machine/include/am69.inc
>>> @@ -0,0 +1,19 @@
>>> +require conf/machine/include/k3.inc
>>> +SOC_FAMILY:append = ":j784s4"
>>> +
>>> +MACHINE_FEATURES += "screen gpu"
>>> +
>>> +require conf/machine/include/mesa-pvr.inc
>>> +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
>>> +
>>> +# Default tiboot3.bin on AM69 is for SR1.0 HS-FS
>>> +IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
>>> +
>>> +# Since default tiboot3.bin on AM69 is for HS-FS, add a version for SR1.0 HS-SE
>>> +IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin"
>>> +
>>> +TFA_BOARD = "j784s4"
>>> +
>>> +OPTEEMACHINE = "k3-j784s4"
>>> +
>>> +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw"
>>> -- 
>>> 2.17.1
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#17616): https://lists.yoctoproject.org/g/meta-ti/message/17616
> Mute This Topic: https://lists.yoctoproject.org/mt/105828549/3619733
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [afd@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>