diff mbox series

[v2,1/2] trusted-firmware-a: update to the latest TF-A LTS

Message ID 20230609171428.3319420-1-jon.mason@arm.com
State New
Headers show
Series [v2,1/2] trusted-firmware-a: update to the latest TF-A LTS | expand

Commit Message

Jon Mason June 9, 2023, 5:14 p.m. UTC
Update TF-A and fiptool (which is part of tf-a) to the latest stable version.
Also, use the tf-a tests lts branch (which is still at version 2.8.0).

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../{fiptool-native_2.8.bb => fiptool-native_2.8.6.bb}      | 6 +++---
 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.8.0.bb | 4 ++--
 ...sted-firmware-a_2.8.0.bb => trusted-firmware-a_2.8.6.bb} | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename meta-arm/recipes-bsp/trusted-firmware-a/{fiptool-native_2.8.bb => fiptool-native_2.8.6.bb} (90%)
 rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.8.0.bb => trusted-firmware-a_2.8.6.bb} (88%)

Comments

Jon Mason June 10, 2023, 7:34 p.m. UTC | #1
On Fri, 9 Jun 2023 12:14:27 -0500, Jon Mason wrote:
> Update TF-A and fiptool (which is part of tf-a) to the latest stable version.
> Also, use the tf-a tests lts branch (which is still at version 2.8.0).

Applied, thanks!

[1/2] trusted-firmware-a: update to the latest TF-A LTS
      commit: ba93470738f15238ffa47b495719e02a567aae7d
[2/2] arm-bsp/tc1: update to use the latest tf-a
      commit: 088c6825f55be50f880344d3fe7228af7de8164a

Best regards,
Jon Mason June 14, 2023, 1:08 p.m. UTC | #2
On Fri, 9 Jun 2023 12:14:27 -0500, Jon Mason wrote:
> Update TF-A and fiptool (which is part of tf-a) to the latest stable version.
> Also, use the tf-a tests lts branch (which is still at version 2.8.0).

Applied, thanks!

[1/2] trusted-firmware-a: update to the latest TF-A LTS
      commit: ba93470738f15238ffa47b495719e02a567aae7d
[2/2] arm-bsp/tc1: update to use the latest tf-a
      commit: 088c6825f55be50f880344d3fe7228af7de8164a

Best regards,
diff mbox series

Patch

diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.8.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.8.6.bb
similarity index 90%
rename from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.8.bb
rename to meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.8.6.bb
index 578f5a29..02f33873 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.8.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.8.6.bb
@@ -7,11 +7,11 @@  LICENSE = "BSD-3-Clause"
 
 SRC_URI_TRUSTED_FIRMWARE_A ?= "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https"
 SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}"
-SRCBRANCH = "master"
 LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde"
 
-# Use fiptool from TF-A v2.8
-SRCREV = "9881bb93a3bc0a3ea37e9f093e09ab4b360a9e48"
+# Use fiptool from TF-A v2.8.6
+SRCREV = "ff0bd5f9bb2ba2f31fb9cec96df917747af9e92d"
+SRCBRANCH = "lts-v2.8"
 
 DEPENDS += "openssl-native"
 
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.8.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.8.0.bb
index 0c094995..ed3b3499 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.8.0.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.8.0.bb
@@ -10,8 +10,8 @@  COMPATIBLE_MACHINE ?= "invalid"
 SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://git.trustedfirmware.org/TF-A/tf-a-tests.git;protocol=https"
 SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH} \
           file://tf-a-tests-no-warn-rwx-segments.patch"
-SRCBRANCH = "master"
-SRCREV = "f7b3be91ab954c495912fc7bc48383cd83bfec2d"
+SRCBRANCH = "lts-v2.8"
+SRCREV = "85442d2943440718c2c2c9c5c690202b4b4f5725"
 
 DEPENDS += "optee-os"
 
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.6.bb
similarity index 88%
rename from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.0.bb
rename to meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.6.bb
index 5830339c..140faf53 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.0.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.6.bb
@@ -1,7 +1,8 @@ 
 require trusted-firmware-a.inc
 
-# TF-A v2.8
-SRCREV_tfa = "9881bb93a3bc0a3ea37e9f093e09ab4b360a9e48"
+# TF-A v2.8.6
+SRCREV_tfa = "ff0bd5f9bb2ba2f31fb9cec96df917747af9e92d"
+SRCBRANCH = "lts-v2.8"
 
 SRC_URI += "file://rwx-segments.patch"