From b5207f77a62f9116f4affbf41670cd4b42d6ebaa Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 2 Mar 2026 11:06:33 -0500 Subject: [PATCH] arm/trusted-firmware-a: update LTSes Update the TF-A recipes to the latest stables/LTS versions. Not all of the versions updated the version of mbedtls being used (and even the updates didn't update to the latest stable version of mbedtls). We're using the mbedtls version specified in docs/getting_started/prerequisites.rst, not the latest available. Also, update the related fiptools and tf-a-tests (which don't map to the same releases, but were all verified to be at the latest versions). No real change in cot-dt2c code, but updating the SHA to the latest. Signed-off-by: Jon Mason --- meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb | 6 +++--- ...iptool-native_2.10.17.bb => fiptool-native_2.10.30.bb} | 4 ++-- ...fiptool-native_2.12.3.bb => fiptool-native_2.12.10.bb} | 4 ++-- ...{fiptool-native_2.14.0.bb => fiptool-native_2.14.1.bb} | 6 +++--- .../{tf-a-tests_2.10.15.bb => tf-a-tests_2.10.24.bb} | 2 +- ...irmware-a_2.10.17.bb => trusted-firmware-a_2.10.30.bb} | 8 ++++---- ...firmware-a_2.12.3.bb => trusted-firmware-a_2.12.10.bb} | 4 ++-- ...-firmware-a_2.14.0.bb => trusted-firmware-a_2.14.1.bb} | 6 +++--- 8 files changed, 20 insertions(+), 20 deletions(-) rename meta-arm/recipes-bsp/trusted-firmware-a/{fiptool-native_2.10.17.bb => fiptool-native_2.10.30.bb} (92%) rename meta-arm/recipes-bsp/trusted-firmware-a/{fiptool-native_2.12.3.bb => fiptool-native_2.12.10.bb} (92%) rename meta-arm/recipes-bsp/trusted-firmware-a/{fiptool-native_2.14.0.bb => fiptool-native_2.14.1.bb} (90%) rename meta-arm/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.10.15.bb => tf-a-tests_2.10.24.bb} (96%) rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.10.17.bb => trusted-firmware-a_2.10.30.bb} (83%) rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.12.3.bb => trusted-firmware-a_2.12.10.bb} (91%) rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.14.0.bb => trusted-firmware-a_2.14.1.bb} (89%) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb index 8e9e37a9..2cffb46c 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb @@ -6,9 +6,9 @@ SRC_URI_TRUSTED_FIRMWARE_A ?= "git://review.trustedfirmware.org/TF-A/trusted-fir SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};branch=${SRCBRANCH}" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e" -# Use cot-dt2c from TF-A v2.14.0 -SRCREV = "1d5aa939bc8d3d892e2ed9945fa50e36a1a924cc" -SRCBRANCH = "master" +# Use cot-dt2c from TF-A v2.14.1 +SRCREV = "e82c7ced9e76aea35b176e608d67dfe5ebe1c569" +SRCBRANCH = "lts-v2.14" inherit python_poetry_core diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.17.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.30.bb similarity index 92% rename from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.17.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.30.bb index 5ae8247c..deab9ad0 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.17.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.30.bb @@ -9,8 +9,8 @@ SRC_URI_TRUSTED_FIRMWARE_A ?= "git://review.trustedfirmware.org/TF-A/trusted-fir 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.17 -SRCREV = "4b1f6671b0cbddad7577fea5fcd7027f5533dc71" +# Use fiptool from TF-A v2.10.30 +SRCREV = "d57b81079003e1647ed4181057c5784c7e3b1c3e" SRCBRANCH = "lts-v2.10" DEPENDS += "openssl-native" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.10.bb similarity index 92% rename from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.3.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.10.bb index af4f4f5b..985fd4c2 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.3.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.10.bb @@ -9,8 +9,8 @@ SRC_URI_TRUSTED_FIRMWARE_A ?= "git://review.trustedfirmware.org/TF-A/trusted-fir SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1" -# Use fiptool from TF-A v2.12.3 -SRCREV = "799fa03173b6c5ab85f70e583dd7d12719592436" +# Use fiptool from TF-A v2.12.10 +SRCREV = "9487b105dcf18d057c6aeb405f9eaa1079c8fe6e" SRCBRANCH = "lts-v2.12" DEPENDS += "openssl-native" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.1.bb similarity index 90% rename from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.0.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.1.bb index a96329e1..d70304aa 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.1.bb @@ -9,9 +9,9 @@ SRC_URI_TRUSTED_FIRMWARE_A ?= "git://review.trustedfirmware.org/TF-A/trusted-fir SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e" -# Use fiptool from TF-A v2.14.0 -SRCREV = "1d5aa939bc8d3d892e2ed9945fa50e36a1a924cc" -SRCBRANCH = "master" +# Use fiptool from TF-A v2.14.1 +SRCREV = "e82c7ced9e76aea35b176e608d67dfe5ebe1c569" +SRCBRANCH = "lts-v2.14" DEPENDS += "openssl-native" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.15.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.24.bb similarity index 96% rename from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.15.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.24.bb index c484721b..b2691122 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.15.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.24.bb @@ -10,7 +10,7 @@ COMPATIBLE_MACHINE ?= "invalid" SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://review.trustedfirmware.org/TF-A/tf-a-tests;protocol=https" SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH}" SRCBRANCH = "lts-v2.10" -SRCREV = "42c6a147d6f8957ff0b6e9eec4591b0927b8769f" +SRCREV = "ad8e3c9506abc6fd093c9753c8e201ddc2daa270" EXTRA_OEMAKE += "USE_NVM=0" EXTRA_OEMAKE += "SHELL_COLOR=1" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.17.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb similarity index 83% rename from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.17.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb index 664c1090..fd19ac91 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.17.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb @@ -1,16 +1,16 @@ require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc -# TF-A v2.10.17 -SRCREV_tfa = "4b1f6671b0cbddad7577fea5fcd7027f5533dc71" +# TF-A v2.10.30 +SRCREV_tfa = "d57b81079003e1647ed4181057c5784c7e3b1c3e" 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.6.3 +# mbedtls-3.6.4 SRCBRANCH_MBEDTLS = "mbedtls-3.6" SRC_URI_MBEDTLS = "git://github.com/Mbed-TLS/mbedtls;name=mbedtls;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/mbedtls;branch=${SRCBRANCH_MBEDTLS}" -SRCREV_mbedtls = "22098d41c6620ce07cf8a0134d37302355e1e5ef" +SRCREV_mbedtls = "c765c831e5c2a0971410692f92f7a81d6ec65ec2" LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb similarity index 91% rename from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.3.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb index 66c30f26..20fc5a7d 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.3.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb @@ -1,7 +1,7 @@ require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc -# TF-A v2.12.3 -SRCREV_tfa = "799fa03173b6c5ab85f70e583dd7d12719592436" +# TF-A v2.12.10 +SRCREV_tfa = "9487b105dcf18d057c6aeb405f9eaa1079c8fe6e" SRCBRANCH = "lts-v2.12" LIC_FILES_CHKSUM += "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.1.bb similarity index 89% rename from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.0.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.1.bb index 31ad8680..2f69d054 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.1.bb @@ -1,9 +1,9 @@ require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc -# TF-A v2.14.0 +# TF-A v2.14.1 SRC_URI_TRUSTED_FIRMWARE_A = "gitsm://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https" -SRCREV_tfa = "1d5aa939bc8d3d892e2ed9945fa50e36a1a924cc" -SRCBRANCH = "master" +SRCREV_tfa = "e82c7ced9e76aea35b176e608d67dfe5ebe1c569" +SRCBRANCH = "lts-v2.14" LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"