[dunfell/master PATCH V3] trusted-firmware-a: Update to v2.4 merge

[dunfell/master PATCH V3] trusted-firmware-a: Update to v2.4 merge

[Nishanth Menon]

Update to v2.4 tag merge from upstream to keep TF-A in sync.

For major changes in trusted-firmware-a, See:
https://trustedfirmware-a.readthedocs.io/en/latest/change-log.html#version-2-4

TI specific fixups include:
 - stub for shutdown (CPUs enter wfi)
 - uart console is now configurable.

While at it, update to include PV_k3 as 2.4 and provide the license file
checksum.

NOTE: We use PV_k3 instead of PV since this allows meta-ti to not
affect other platforms esp in a multi-BSP configuration.

Suggested-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
---

Changes since v2:
 - Update license file and checksum (Thanks Dan for catching my next
   blunder)

Changes since v1 in v2:
 - Update for PV_k3 (Thanks Denys) - I was'nt sure to pick a
 "Reviewed-by" tag for your LGTM :).. so did'nt want to guess.

 recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index 3c1862643086..c561fe2d7e76 100644
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -1,6 +1,8 @@
+PV_k3 = "2.4"
+LIC_FILES_CHKSUM = "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 = "52c334fc361194e3896ea3b2529c10a06e586a5f"
+SRCREV_tfa_k3 = "f0a310d000fd6e8a1ed0ccc365b5931390393db1"
 COMPATIBLE_MACHINE_k3 = "k3"
 TFA_BUILD_TARGET_k3 = "all"
 TFA_INSTALL_TARGET_k3 = "bl31"
-- 
2.25.1.377.g2d2118b814c1

Re: [dunfell/master PATCH V3] trusted-firmware-a: Update to v2.4 merge

[Denys Dmytriyenko]

On Thu, Dec 10, 2020 at 05:13:51PM -0600, Nishanth Menon wrote:
> Update to v2.4 tag merge from upstream to keep TF-A in sync.
> 
> For major changes in trusted-firmware-a, See:
> https://trustedfirmware-a.readthedocs.io/en/latest/change-log.html#version-2-4
> 
> TI specific fixups include:
>  - stub for shutdown (CPUs enter wfi)
>  - uart console is now configurable.
> 
> While at it, update to include PV_k3 as 2.4 and provide the license file
> checksum.
> 
> NOTE: We use PV_k3 instead of PV since this allows meta-ti to not
> affect other platforms esp in a multi-BSP configuration.
> 
> Suggested-by: Dan Murphy <dmurphy@ti.com>
> Signed-off-by: Nishanth Menon <nm@ti.com>
> ---
> 
> Changes since v2:
>  - Update license file and checksum (Thanks Dan for catching my next
>    blunder)
> 
> Changes since v1 in v2:
>  - Update for PV_k3 (Thanks Denys) - I was'nt sure to pick a
>  "Reviewed-by" tag for your LGTM :).. so did'nt want to guess.

I didn't want to impose... :) But if you like, I can do a proper "Reviewed-by" 
next time.


>  recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
> index 3c1862643086..c561fe2d7e76 100644
> --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
> +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
> @@ -1,6 +1,8 @@
> +PV_k3 = "2.4"
> +LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"

Well, same thing here. You are changing an upstream recipe variable that 
should only be changed for meta-ti platforms, or more specifically K3.

Think of it this way: a multi-BSP Distro has both meta-ti and meta-raspberrypi 
layers setup. When building for a TI K3 platform, everything works, but when 
building for RPi4, it's not a K3 platform and none of the TI customizations 
come in play, except the license checksum update, which obviously fails.

Any .bbappend against an upstream recipe should be considerate of other 
platforms in other BSP layers.


>  BRANCH_k3 = "ti-atf"
>  SRC_URI_k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa"
> -SRCREV_tfa_k3 = "52c334fc361194e3896ea3b2529c10a06e586a5f"
> +SRCREV_tfa_k3 = "f0a310d000fd6e8a1ed0ccc365b5931390393db1"
>  COMPATIBLE_MACHINE_k3 = "k3"
>  TFA_BUILD_TARGET_k3 = "all"
>  TFA_INSTALL_TARGET_k3 = "bl31"
> -- 
> 2.25.1.377.g2d2118b814c1
> 

-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964

Re: [dunfell/master PATCH V3] trusted-firmware-a: Update to v2.4 merge

[Nishanth Menon]

On 18:31-20201210, Denys Dmytriyenko wrote:
> On Thu, Dec 10, 2020 at 05:13:51PM -0600, Nishanth Menon wrote:
> > Update to v2.4 tag merge from upstream to keep TF-A in sync.
> > 
> > For major changes in trusted-firmware-a, See:
> > https://trustedfirmware-a.readthedocs.io/en/latest/change-log.html#version-2-4
> > 
> > TI specific fixups include:
> >  - stub for shutdown (CPUs enter wfi)
> >  - uart console is now configurable.
> > 
> > While at it, update to include PV_k3 as 2.4 and provide the license file
> > checksum.
> > 
> > NOTE: We use PV_k3 instead of PV since this allows meta-ti to not
> > affect other platforms esp in a multi-BSP configuration.
> > 
> > Suggested-by: Dan Murphy <dmurphy@ti.com>
> > Signed-off-by: Nishanth Menon <nm@ti.com>
> > ---
> > 
> > Changes since v2:
> >  - Update license file and checksum (Thanks Dan for catching my next
> >    blunder)
> > 
> > Changes since v1 in v2:
> >  - Update for PV_k3 (Thanks Denys) - I was'nt sure to pick a
> >  "Reviewed-by" tag for your LGTM :).. so did'nt want to guess.
> 
> I didn't want to impose... :) But if you like, I can do a proper "Reviewed-by" 
> next time.

ROFL... that will help..
> 
> 
> >  recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
> > index 3c1862643086..c561fe2d7e76 100644
> > --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
> > +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
> > @@ -1,6 +1,8 @@
> > +PV_k3 = "2.4"
> > +LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
> 
> Well, same thing here. You are changing an upstream recipe variable that 
> should only be changed for meta-ti platforms, or more specifically K3.
> 
> Think of it this way: a multi-BSP Distro has both meta-ti and meta-raspberrypi 
> layers setup. When building for a TI K3 platform, everything works, but when 
> building for RPi4, it's not a K3 platform and none of the TI customizations 
> come in play, except the license checksum update, which obviously fails.
> 
> Any .bbappend against an upstream recipe should be considerate of other 
> platforms in other BSP layers.


hehe.. I am getting the hard way into learning OE layers :).. Thanks for
looking out for us.

s/LIC_FILES_CHKSUM/LIC_FILES_CHKSUM_k3 coming right up..

-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D