Skip to contentSkip to conversation

trusted-firmware-a: Update to v2.4 merge

PATCH Superseded Nishanth Menon 2 participants 2 messages Dec 10, 2020

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 trusted-firmware-a: Update to v2.4 merge

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 as 2.4

---
 recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +2 -1
index 3c1862643086..08b2e04ff711 100644
@@ -1,6 +1,7 @@
+PV = "2.4"
 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"
Signature · 1 line
2.25.1.377.g2d2118b814c1
#1 lore raw

Nishanth

From Denys

Quoted 22 lines · 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 as 2.4

---
  recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +0 -0
index 3c1862643086..08b2e04ff711 100644

recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend line 1

Quoted 1 line
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +1 -0
@@ -1,6 +1,7 @@
+PV = "2.4"

^^^ This should be specific to a platform or SoC family.
See how all other variables below are specific to K3 with _k3 override.
Hence: PV_k3 = "2.4"

The reason is to not affect other platforms when using meta-ti in a multi-BSP distros.

Quoted 7 lines
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +1 -1
  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"