[PATCH 1/3] arm/trusted-firmware-a: update 2.10 LTS to the latest versions

Update TF-A LTS to 2.10.9 (which includes an mbedtls bump to 3.6.1, per
docs).  Also, bump the TF-A tests to the latest version.

Signed-off-by: Jon Mason <[email protected]>
---
 ...ptool-native_2.10.4.bb => fiptool-native_2.10.9.bb} |  4 ++--
 .../{tf-a-tests_2.10.0.bb => tf-a-tests_2.10.3.bb}     |  5 ++---
 ...rmware-a_2.10.4.bb => trusted-firmware-a_2.10.9.bb} | 10 +++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)
 rename meta-arm/recipes-bsp/trusted-firmware-a/{fiptool-native_2.10.4.bb => fiptool-native_2.10.9.bb} (92%)
 rename meta-arm/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.10.0.bb => tf-a-tests_2.10.3.bb} (90%)
 rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.10.4.bb => trusted-firmware-a_2.10.9.bb} (74%)

diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.4.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.9.bb
similarity index 92%
rename from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.4.bb
rename to meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.9.bb
index 9072dca50a50..a6ebea976d1c 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.4.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.9.bb
@@ -9,8 +9,8 @@ SRC_URI_TRUSTED_FIRMWARE_A ?= "git://git.trustedfirmware.org/TF-A/trusted-firmwa
 SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}"
 LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde"
 
-# Use fiptool from TF-A v2.10.4
-SRCREV = "569e16caad976a0684147da1ecc6333fd9b7f813"
+# Use fiptool from TF-A v2.10.9
+SRCREV = "7e63213601425c7a6d83e47dc936b264deb9df2b"
 SRCBRANCH = "lts-v2.10"
 
 DEPENDS += "openssl-native"
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.3.bb
similarity index 90%
rename from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.0.bb
rename to meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.3.bb
index fffdf5d3653d..645e8d86a8a6 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.0.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.3.bb
@@ -8,10 +8,9 @@ inherit deploy
 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} \
-          "
+SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};nobranch=1"
 SRCBRANCH = "master"
-SRCREV = "42b99719d5dde58bdde07712bcb70a20d87f9067"
+SRCREV = "8917cf8b5eeb409b63256076d0dc35c60930ce18"
 
 DEPENDS += "optee-os"
 
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.4.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.9.bb
similarity index 74%
rename from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.4.bb
rename to meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.9.bb
index 8cdfda443cde..aab78477f484 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.4.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.9.bb
@@ -1,15 +1,15 @@
 require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
 
-# TF-A v2.10.4
-SRCREV_tfa = "569e16caad976a0684147da1ecc6333fd9b7f813"
+# TF-A v2.10.9
+SRCREV_tfa = "7e63213601425c7a6d83e47dc936b264deb9df2b"
 SRCBRANCH = "lts-v2.10"
 
 LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde"
 
 # in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls
-# mbedtls-3.4.1
-SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=master"
-SRCREV_mbedtls = "72718dd87e087215ce9155a826ee5a66cfbe9631"
+# mbedtls-3.6.1
+SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-3.6"
+SRCREV_mbedtls = "71c569d44bf3a8bd53d874c81ee8ac644dd6e9e3"
 
 LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-- 
2.39.5 (Apple Git-154)