From 6680b3b376a1a5a680fc4c44ea2c503af9ee2fe4 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 15 Dec 2025 09:27:59 -0500 Subject: [PATCH] arm/trusted-firmware-m: update 2.1.x to latest hotfix release Signed-off-by: Jon Mason --- ...-src.inc => trusted-firmware-m-2.1.4-src.inc} | 16 ++++++++-------- ...> trusted-firmware-m-scripts-native_2.1.4.bb} | 0 ...re-m_2.1.1.bb => trusted-firmware-m_2.1.4.bb} | 0 3 files changed, 8 insertions(+), 8 deletions(-) rename meta-arm/recipes-bsp/trusted-firmware-m/{trusted-firmware-m-2.1.1-src.inc => trusted-firmware-m-2.1.4-src.inc} (91%) rename meta-arm/recipes-bsp/trusted-firmware-m/{trusted-firmware-m-scripts-native_2.1.1.bb => trusted-firmware-m-scripts-native_2.1.4.bb} (100%) rename meta-arm/recipes-bsp/trusted-firmware-m/{trusted-firmware-m_2.1.1.bb => trusted-firmware-m_2.1.4.bb} (100%) diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.1.1-src.inc b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.1.4-src.inc similarity index 91% rename from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.1.1-src.inc rename to meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.1.4-src.inc index 10a046e1..bae9b11d 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.1.1-src.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.1.4-src.inc @@ -27,21 +27,21 @@ SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_M};branch=${SRCBRANCH_tfm};name=tfm;dests " # The required dependencies are documented in tf-m/config/config_base.cmake -# TF-Mv2.1.1 +# TF-Mv2.1.4 SRCBRANCH_tfm ?= "release/2.1.x" -SRCREV_tfm = "02bf279913439a07082dd581df033f370a8fbb92" -# TF-Mv2.1.1 +SRCREV_tfm = "03d02d6feed02583c41acfe7147d1117678797a3" +# TF-Mv2.1.4 SRCBRANCH_tfm-extras ?= "release/2.1.x" -SRCREV_tfm-extras = "95add8abb15879f48f1069a0952dd9abdffbc1f8" -# TF-Mv2.1.1 +SRCREV_tfm-extras = "ef7814a8c95d7df4b150a66557c0073cddce6593" +# TF-Mv2.1.4 SRCBRANCH_tfm-tests ?= "release/2.1.x" -SRCREV_tfm-tests = "6f642014a8c255e163ae0bc4d21e327de694d6a2" +SRCREV_tfm-tests = "852c6f74c5b7ae61e140d1a46e981f95177aa40e" # CMSIS v6.0.0+ (intermediate SHA), CMSIS_TAG from lib/ext/cmsis/CMakeLists.txt SRCBRANCH_cmsis ?= "main" SRCREV_cmsis = "d0c460c1697d210b49a4b90998195831c0cd325c" -# mbedtls-3.6.2, value from MBEDCRYPTO_VERSION +# mbedtls-3.6.5, value from MBEDCRYPTO_VERSION SRCBRANCH_mbedtls ?= "mbedtls-3.6" -SRCREV_mbedtls = "107ea89daaefb9867ea9121002fbbdf926780e98" +SRCREV_mbedtls = "e185d7fd85499c8ce5ca2a54f5cf8fe7dbe3f8df" # mcuboot v2.1.0, value from MCUBOOT_VERSION SRCBRANCH_mcuboot ?= "main" SRCREV_mcuboot = "9c99326b9756dbcc35b524636d99ed5f3e6cb29b" diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.1.1.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.1.4.bb similarity index 100% rename from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.1.1.bb rename to meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.1.4.bb diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.1.1.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.1.4.bb similarity index 100% rename from meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.1.1.bb rename to meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.1.4.bb