diff mbox series

[meta-ti,master/scarthgap,1/3] trusted-firmware-a: Switch TFA to TI fork

Message ID 20250204134925.968150-2-c-shilwant@ti.com
State Rejected
Delegated to: Ryan Eatmon
Headers show
Series Add support for AM62L | expand

Commit Message

Chirag Shilwant Feb. 4, 2025, 1:49 p.m. UTC 
- While TFA patches for K3-based AM62L platform are under
review upstream, temporarily switch to TI's GitHub fork
for all K3 platforms to prevent disruptions and ensure timely bringup

- Also update the PV & LIC_FILES_CHKSUM as well

Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
---
 .../trusted-firmware-a/trusted-firmware-a-ti.inc         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Andrew Davis Feb. 4, 2025, 4:25 p.m. UTC | #1 
On 2/4/25 7:49 AM, Chirag Shilwant via lists.yoctoproject.org wrote:
> - While TFA patches for K3-based AM62L platform are under
> review upstream, temporarily switch to TI's GitHub fork
> for all K3 platforms to prevent disruptions and ensure timely bringup
> 
> - Also update the PV & LIC_FILES_CHKSUM as well

The license change isn't something we did as part of our fork ti-atf.
Maybe you could split this into two to make that clear,

  * Update to upstream 2.12 + license fix
  * Patch that only deals with switching to ti-atf.

Andrew

> 
> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
> ---
>   .../trusted-firmware-a/trusted-firmware-a-ti.inc         | 9 +++++----
>   1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
> index ebb13bbd..e4a9c49b 100644
> --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
> +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
> @@ -1,7 +1,8 @@
> -PV:k3 = "2.11+git"
> -SRCREV_tfa:k3 = "58b25570c9ef91753b14c2103f45f4be9dddb696"
> -LIC_FILES_CHKSUM:k3 = "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1"
> -SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master"
> +PV:k3 = "2.12+git"
> +SRCREV_tfa:k3 = "5227171c079d0c7d22a6d37b5cec079c8c5bb4b1"
> +LIC_FILES_CHKSUM:k3 = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
> +SRC_URI:k3 = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https;name=tfa;branch=ti-master"
> +
>   COMPATIBLE_MACHINE:k3 = "k3"
>   TFA_BUILD_TARGET:k3 = "all"
>   TFA_INSTALL_TARGET:k3 = "bl31"
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#18256): https://lists.yoctoproject.org/g/meta-ti/message/18256
> Mute This Topic: https://lists.yoctoproject.org/mt/110991529/3619733
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [afd@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Ryan Eatmon Feb. 4, 2025, 4:47 p.m. UTC | #2 
On 2/4/2025 10:25 AM, Andrew Davis wrote:
> On 2/4/25 7:49 AM, Chirag Shilwant via lists.yoctoproject.org wrote:
>> - While TFA patches for K3-based AM62L platform are under
>> review upstream, temporarily switch to TI's GitHub fork
>> for all K3 platforms to prevent disruptions and ensure timely bringup
>>
>> - Also update the PV & LIC_FILES_CHKSUM as well
> 
> The license change isn't something we did as part of our fork ti-atf.
> Maybe you could split this into two to make that clear,
> 
>   * Update to upstream 2.12 + license fix
>   * Patch that only deals with switching to ti-atf.
> 
> Andrew

Agreed.


>>
>> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
>> ---
>>   .../trusted-firmware-a/trusted-firmware-a-ti.inc         | 9 +++++----
>>   1 file changed, 5 insertions(+), 4 deletions(-)
>>
>> diff --git 
>> a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc 
>> b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
>> index ebb13bbd..e4a9c49b 100644
>> --- 
>> a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
>> +++ 
>> b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
>> @@ -1,7 +1,8 @@
>> -PV:k3 = "2.11+git"
>> -SRCREV_tfa:k3 = "58b25570c9ef91753b14c2103f45f4be9dddb696"
>> -LIC_FILES_CHKSUM:k3 = 
>> "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1"
>> -SRC_URI:k3 = 
>> "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master"
>> +PV:k3 = "2.12+git"
>> +SRCREV_tfa:k3 = "5227171c079d0c7d22a6d37b5cec079c8c5bb4b1"
>> +LIC_FILES_CHKSUM:k3 = 
>> "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
>> +SRC_URI:k3 = 
>> "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https;name=tfa;branch=ti-master"
>> +
>>   COMPATIBLE_MACHINE:k3 = "k3"
>>   TFA_BUILD_TARGET:k3 = "all"
>>   TFA_INSTALL_TARGET:k3 = "bl31"
>>
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#18256): 
>> https://lists.yoctoproject.org/g/meta-ti/message/18256
>> Mute This Topic: https://lists.yoctoproject.org/mt/110991529/3619733
>> Group Owner: meta-ti+owner@lists.yoctoproject.org
>> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [afd@ti.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
Denys Dmytriyenko Feb. 4, 2025, 7:16 p.m. UTC | #3 
On Tue, Feb 04, 2025 at 10:25:14AM -0600, Andrew Davis via lists.yoctoproject.org wrote:
> On 2/4/25 7:49 AM, Chirag Shilwant via lists.yoctoproject.org wrote:
> >- While TFA patches for K3-based AM62L platform are under
> >review upstream, temporarily switch to TI's GitHub fork
> >for all K3 platforms to prevent disruptions and ensure timely bringup
> >
> >- Also update the PV & LIC_FILES_CHKSUM as well
> 
> The license change isn't something we did as part of our fork ti-atf.
> Maybe you could split this into two to make that clear,
> 
>  * Update to upstream 2.12 + license fix
>  * Patch that only deals with switching to ti-atf.

Andrew,

Any downside to switching from upstream tfa to ti-tfa?

Is the only change to support non-R5 platform and won't affect other K3 
devices?


> >Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
> >---
> >  .../trusted-firmware-a/trusted-firmware-a-ti.inc         | 9 +++++----
> >  1 file changed, 5 insertions(+), 4 deletions(-)
> >
> >diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
> >index ebb13bbd..e4a9c49b 100644
> >--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
> >+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
> >@@ -1,7 +1,8 @@
> >-PV:k3 = "2.11+git"
> >-SRCREV_tfa:k3 = "58b25570c9ef91753b14c2103f45f4be9dddb696"
> >-LIC_FILES_CHKSUM:k3 = "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1"
> >-SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master"
> >+PV:k3 = "2.12+git"
> >+SRCREV_tfa:k3 = "5227171c079d0c7d22a6d37b5cec079c8c5bb4b1"
> >+LIC_FILES_CHKSUM:k3 = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
> >+SRC_URI:k3 = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https;name=tfa;branch=ti-master"
> >+
> >  COMPATIBLE_MACHINE:k3 = "k3"
> >  TFA_BUILD_TARGET:k3 = "all"
> >  TFA_INSTALL_TARGET:k3 = "bl31"
Andrew Davis Feb. 4, 2025, 8:05 p.m. UTC | #4 
On 2/4/25 1:16 PM, Denys Dmytriyenko wrote:
> On Tue, Feb 04, 2025 at 10:25:14AM -0600, Andrew Davis via lists.yoctoproject.org wrote:
>> On 2/4/25 7:49 AM, Chirag Shilwant via lists.yoctoproject.org wrote:
>>> - While TFA patches for K3-based AM62L platform are under
>>> review upstream, temporarily switch to TI's GitHub fork
>>> for all K3 platforms to prevent disruptions and ensure timely bringup
>>>
>>> - Also update the PV & LIC_FILES_CHKSUM as well
>>
>> The license change isn't something we did as part of our fork ti-atf.
>> Maybe you could split this into two to make that clear,
>>
>>   * Update to upstream 2.12 + license fix
>>   * Patch that only deals with switching to ti-atf.
> 
> Andrew,
> 
> Any downside to switching from upstream tfa to ti-tfa?
> 
> Is the only change to support non-R5 platform and won't affect other K3
> devices?
> 

Right, this fork should only be needed for AM62L, and there was
some talk around only using the fork for that platform. But the
thinking here is that if something in that fork accidentally does
break the other K3 devices, it is best we find out about it early
here by our SDK testing vs later when the patches end up in
upstream.

Hopefully this will not be a long running fork and we can switch
back to upstream when the AM62L support patches are taken upstream.

Andrew

> 
>>> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
>>> ---
>>>   .../trusted-firmware-a/trusted-firmware-a-ti.inc         | 9 +++++----
>>>   1 file changed, 5 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
>>> index ebb13bbd..e4a9c49b 100644
>>> --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
>>> +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
>>> @@ -1,7 +1,8 @@
>>> -PV:k3 = "2.11+git"
>>> -SRCREV_tfa:k3 = "58b25570c9ef91753b14c2103f45f4be9dddb696"
>>> -LIC_FILES_CHKSUM:k3 = "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1"
>>> -SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master"
>>> +PV:k3 = "2.12+git"
>>> +SRCREV_tfa:k3 = "5227171c079d0c7d22a6d37b5cec079c8c5bb4b1"
>>> +LIC_FILES_CHKSUM:k3 = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
>>> +SRC_URI:k3 = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https;name=tfa;branch=ti-master"
>>> +
>>>   COMPATIBLE_MACHINE:k3 = "k3"
>>>   TFA_BUILD_TARGET:k3 = "all"
>>>   TFA_INSTALL_TARGET:k3 = "bl31"
Chirag Shilwant Feb. 5, 2025, 9:46 a.m. UTC | #5 
Hi Andrew & Ryan,

On 05/02/25 01:35, Andrew Davis wrote:
> On 2/4/25 1:16 PM, Denys Dmytriyenko wrote:
>> On Tue, Feb 04, 2025 at 10:25:14AM -0600, Andrew Davis via 
>> lists.yoctoproject.org wrote:
>>> On 2/4/25 7:49 AM, Chirag Shilwant via lists.yoctoproject.org wrote:
>>>> - While TFA patches for K3-based AM62L platform are under
>>>> review upstream, temporarily switch to TI's GitHub fork
>>>> for all K3 platforms to prevent disruptions and ensure timely bringup
>>>>
>>>> - Also update the PV & LIC_FILES_CHKSUM as well
>>>
>>> The license change isn't something we did as part of our fork ti-atf.
>>> Maybe you could split this into two to make that clear,
>>>
>>>   * Update to upstream 2.12 + license fix
>>>   * Patch that only deals with switching to ti-atf.



I understand the intention of splitting the TFA changes into two commits
to avoid highlighting the fact that switching to GitHub fork isn't
updating the LICENSE file.

But this isn't possible because TFA 2.12 had a different LICENSE version
& the current TFA upstream master (eventually which was used to create
the TI fork) has a different LICENSE version. So, even if I go ahead & make
it granular it would be something like,

* Update to upstream 2.12 + license SHA update
* Patch that switches to ti-atf + license SHA update


I had an offline syncup with Praneeth on the above split I mentioned & will
eventually go ahead with the same in v2


--
Chirag



>>
>> Andrew,
>>
>> Any downside to switching from upstream tfa to ti-tfa?
>>
>> Is the only change to support non-R5 platform and won't affect other K3
>> devices?
>>
>
> Right, this fork should only be needed for AM62L, and there was
> some talk around only using the fork for that platform. But the
> thinking here is that if something in that fork accidentally does
> break the other K3 devices, it is best we find out about it early
> here by our SDK testing vs later when the patches end up in
> upstream.
>
> Hopefully this will not be a long running fork and we can switch
> back to upstream when the AM62L support patches are taken upstream.
>
> Andrew
>
>>
>>>> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
>>>> ---
>>>>   .../trusted-firmware-a/trusted-firmware-a-ti.inc         | 9 
>>>> +++++----
>>>>   1 file changed, 5 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git 
>>>> a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc 
>>>> b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
>>>> index ebb13bbd..e4a9c49b 100644
>>>> --- 
>>>> a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
>>>> +++ 
>>>> b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
>>>> @@ -1,7 +1,8 @@
>>>> -PV:k3 = "2.11+git"
>>>> -SRCREV_tfa:k3 = "58b25570c9ef91753b14c2103f45f4be9dddb696"
>>>> -LIC_FILES_CHKSUM:k3 = 
>>>> "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1"
>>>> -SRC_URI:k3 = 
>>>> "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master"
>>>> +PV:k3 = "2.12+git"
>>>> +SRCREV_tfa:k3 = "5227171c079d0c7d22a6d37b5cec079c8c5bb4b1"
>>>> +LIC_FILES_CHKSUM:k3 = 
>>>> "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
>>>> +SRC_URI:k3 = 
>>>> "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https;name=tfa;branch=ti-master"
>>>> +
>>>>   COMPATIBLE_MACHINE:k3 = "k3"
>>>>   TFA_BUILD_TARGET:k3 = "all"
>>>>   TFA_INSTALL_TARGET:k3 = "bl31"
diff mbox series

Patch

diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
index ebb13bbd..e4a9c49b 100644
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
@@ -1,7 +1,8 @@ 
-PV:k3 = "2.11+git"
-SRCREV_tfa:k3 = "58b25570c9ef91753b14c2103f45f4be9dddb696"
-LIC_FILES_CHKSUM:k3 = "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1"
-SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master"
+PV:k3 = "2.12+git"
+SRCREV_tfa:k3 = "5227171c079d0c7d22a6d37b5cec079c8c5bb4b1"
+LIC_FILES_CHKSUM:k3 = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
+SRC_URI:k3 = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https;name=tfa;branch=ti-master"
+
 COMPATIBLE_MACHINE:k3 = "k3"
 TFA_BUILD_TARGET:k3 = "all"
 TFA_INSTALL_TARGET:k3 = "bl31"