Skip to contentSkip to conversation

trusted-firmware-a: Move back to tfa upstream except for am62lxx

PATCH Superseded Ryan Eatmon 2 participants 3 messages Jul 1, 2025

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 trusted-firmware-a: Move back to tfa upstream except for am62lxx

This moves all of the platforms back to the main TFA repository, but still points to the TI fork for the am62lxx platform while we continue to work on upstreaming the needed patches.

---
 .../trusted-firmware-a-ti.inc                   | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc +12 -5
index c17ac9de..ec52d09c 100644
@@ -1,12 +1,19 @@
 # NOTE: This .inc file with customizations only gets included for K3 platforms
 
-PV = "2.12+git"
-SRCREV_tfa = "2ab59f45ad0a5d95b5cb339c0f64686954377050"
-SRC_URI_TRUSTED_FIRMWARE_A = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
-SRCBRANCH = "ti-master"
+PV = "2.13+git"
+
+LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
+SRCREV_tfa = "d90bb650fe4cb3784f62214ab5829f4051c38d0a"
+SRC_URI_TRUSTED_FIRMWARE_A = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https"
+SRCBRANCH = "master"
+
+LIC_FILES_CHKSUM:am62lxx = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
+SRCREV_tfa:am62lxx = "2ab59f45ad0a5d95b5cb339c0f64686954377050"
+SRC_URI_TRUSTED_FIRMWARE_A:am62lxx = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
+SRCBRANCH:am62lxx = "ti-master"
+
 SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}"
 
-LIC_FILES_CHKSUM = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
 COMPATIBLE_MACHINE = "k3"
 
 TFA_BUILD_TARGET = "all"
Signature · 1 line
2.17.1
#1 lore raw
Quoted 3 lines · Ryan Eatmon via lists.yoctoproject.org

This moves all of the platforms back to the main TFA repository, but still points to the TI fork for the am62lxx platform while we continue to work on upstreaming the needed patches.

When I stumbled upon this change being tested in master-wip last wekk, I noticed it was failing due to LIC_FILES_CHKSUM - I see you fixed it here.

Still, as previously discussed, should there be a brief comment explaining why the hash is different?

Quoted 36 lines
---
 .../trusted-firmware-a-ti.inc                   | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc +12 -5
index c17ac9de..ec52d09c 100644
@@ -1,12 +1,19 @@
 # NOTE: This .inc file with customizations only gets included for K3 platforms
 
-PV = "2.12+git"
-SRCREV_tfa = "2ab59f45ad0a5d95b5cb339c0f64686954377050"
-SRC_URI_TRUSTED_FIRMWARE_A = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
-SRCBRANCH = "ti-master"
+PV = "2.13+git"
+
+LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
+SRCREV_tfa = "d90bb650fe4cb3784f62214ab5829f4051c38d0a"
+SRC_URI_TRUSTED_FIRMWARE_A = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https"
+SRCBRANCH = "master"
+
+LIC_FILES_CHKSUM:am62lxx = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
+SRCREV_tfa:am62lxx = "2ab59f45ad0a5d95b5cb339c0f64686954377050"
+SRC_URI_TRUSTED_FIRMWARE_A:am62lxx = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
+SRCBRANCH:am62lxx = "ti-master"
+
 SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}"
 
-LIC_FILES_CHKSUM = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
 COMPATIBLE_MACHINE = "k3"
 
 TFA_BUILD_TARGET = "all"
Signature · 1 line
2.17.1
#2 lore raw
Quoted 10 lines · Denys Dmytriyenko
Quoted 3 lines · Ryan Eatmon via lists.yoctoproject.org

This moves all of the platforms back to the main TFA repository, but still points to the TI fork for the am62lxx platform while we continue to work on upstreaming the needed patches.

When I stumbled upon this change being tested in master-wip last wekk, I noticed it was failing due to LIC_FILES_CHKSUM - I see you fixed it here.

Still, as previously discussed, should there be a brief comment explaining why the hash is different?

Sure. In this case it is not "different" as much as it is matching what is in master now that we are pointing to it again. But I'll send a v2.

Quoted 37 lines
Quoted 37 lines
---
  .../trusted-firmware-a-ti.inc                   | 17 ++++++++++++-----
  1 file changed, 12 insertions(+), 5 deletions(-)
meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc +12 -5
index c17ac9de..ec52d09c 100644
@@ -1,12 +1,19 @@
  # NOTE: This .inc file with customizations only gets included for K3 platforms
 
-PV = "2.12+git"
-SRCREV_tfa = "2ab59f45ad0a5d95b5cb339c0f64686954377050"
-SRC_URI_TRUSTED_FIRMWARE_A = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
-SRCBRANCH = "ti-master"
+PV = "2.13+git"
+
+LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
+SRCREV_tfa = "d90bb650fe4cb3784f62214ab5829f4051c38d0a"
+SRC_URI_TRUSTED_FIRMWARE_A = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https"
+SRCBRANCH = "master"
+
+LIC_FILES_CHKSUM:am62lxx = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
+SRCREV_tfa:am62lxx = "2ab59f45ad0a5d95b5cb339c0f64686954377050"
+SRC_URI_TRUSTED_FIRMWARE_A:am62lxx = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
+SRCBRANCH:am62lxx = "ti-master"
+
  SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}"
 
-LIC_FILES_CHKSUM = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
  COMPATIBLE_MACHINE = "k3"
 
  TFA_BUILD_TARGET = "all"
Signature · 1 line
2.17.1
Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS