[meta-ti,dunfell,1/2] trusted-firmware-a: Update to latest upstream master

Message ID 20220526155254.32536-1-afd@ti.com
State Superseded
Delegated to: Ryan Eatmon
Headers show
Series [meta-ti,dunfell,1/2] trusted-firmware-a: Update to latest upstream master | expand

Commit Message

Andrew Davis May 26, 2022, 3:52 p.m. UTC
For TF-A we work against upstream first, our fork has only been
used in the rare cases we need to ship a feature before we can
get it upstream. This is not currently the case so lets switch
to upstream repo until there is a need for our fork.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Denys Dmytriyenko May 26, 2022, 4:08 p.m. UTC | #1
On Thu, May 26, 2022 at 10:52:53AM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> For TF-A we work against upstream first, our fork has only been
> used in the rare cases we need to ship a feature before we can
> get it upstream. This is not currently the case so lets switch
> to upstream repo until there is a need for our fork.
> 
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
>  recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
> index 68bfa899..207f3dac 100644
> --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
> +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
> @@ -1,8 +1,6 @@
>  PV_k3 = "2.6"
>  LIC_FILES_CHKSUM_k3 = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
> -BRANCH_k3 = "ti-atf"
> -SRC_URI_k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa"
> -SRCREV_tfa_k3 = "6541aa24f834daa80da701e0054dfe3a16cda0ce"
> +SRCREV_tfa_k3 = "453abc80b2eacbf2816c838e47e40f063227d934"

What is the corresponding TFA version for this commit?


>  COMPATIBLE_MACHINE_k3 = "k3"
>  TFA_BUILD_TARGET_k3 = "all"
>  TFA_INSTALL_TARGET_k3 = "bl31"
> -- 
> 2.36.1
Andrew Davis May 26, 2022, 4:50 p.m. UTC | #2
On 5/26/22 11:08 AM, Denys Dmytriyenko wrote:
> On Thu, May 26, 2022 at 10:52:53AM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>> For TF-A we work against upstream first, our fork has only been
>> used in the rare cases we need to ship a feature before we can
>> get it upstream. This is not currently the case so lets switch
>> to upstream repo until there is a need for our fork.
>>
>> Signed-off-by: Andrew Davis <afd@ti.com>
>> ---
>>   recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 4 +---
>>   1 file changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
>> index 68bfa899..207f3dac 100644
>> --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
>> +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
>> @@ -1,8 +1,6 @@
>>   PV_k3 = "2.6"
>>   LIC_FILES_CHKSUM_k3 = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
>> -BRANCH_k3 = "ti-atf"
>> -SRC_URI_k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa"
>> -SRCREV_tfa_k3 = "6541aa24f834daa80da701e0054dfe3a16cda0ce"
>> +SRCREV_tfa_k3 = "453abc80b2eacbf2816c838e47e40f063227d934"
> 
> What is the corresponding TFA version for this commit?
> 


2.7-rc0, so still technically a 2.6. When the final 2.7 drops I'll
update as needed.

Andrew


> 
>>   COMPATIBLE_MACHINE_k3 = "k3"
>>   TFA_BUILD_TARGET_k3 = "all"
>>   TFA_INSTALL_TARGET_k3 = "bl31"
>> -- 
>> 2.36.1
>

Patch

diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index 68bfa899..207f3dac 100644
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -1,8 +1,6 @@ 
 PV_k3 = "2.6"
 LIC_FILES_CHKSUM_k3 = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
-BRANCH_k3 = "ti-atf"
-SRC_URI_k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa"
-SRCREV_tfa_k3 = "6541aa24f834daa80da701e0054dfe3a16cda0ce"
+SRCREV_tfa_k3 = "453abc80b2eacbf2816c838e47e40f063227d934"
 COMPATIBLE_MACHINE_k3 = "k3"
 TFA_BUILD_TARGET_k3 = "all"
 TFA_INSTALL_TARGET_k3 = "bl31"