similarity index 92%
rename from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.2.bb
rename to meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.9.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=6ed7bace7b0bc63021c6eba7b524039e"
-# Use fiptool from TF-A v2.14.2
-SRCREV = "aa1793fff49a1b5a6a877c278a0df0a188e2b1f2"
+# Use fiptool from TF-A v2.14.9
+SRCREV = "16868ce4eafdbf7903fcd7eb15429d4e8b258de4"
SRCBRANCH = "lts-v2.14"
DEPENDS += "openssl-native"
deleted file mode 100644
@@ -1,38 +0,0 @@
-require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
-
-# TF-A v2.14.2
-SRC_URI_TRUSTED_FIRMWARE_A = "gitsm://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https"
-SRCREV_tfa = "aa1793fff49a1b5a6a877c278a0df0a188e2b1f2"
-SRCBRANCH = "lts-v2.14"
-
-LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
-
-# mbed TLS support (set TFA_MBEDTLS to 1 to activate)
-TFA_MBEDTLS ?= "0"
-# sub-directory in which mbedtls will be downloaded
-# Only needed for legacy versions, as v2.15.0 added this as a git submodule
-TFA_MBEDTLS_DIR ?= "mbedtls"
-# This should be set to MBEDTLS download URL if MBEDTLS is needed
-SRC_URI_MBEDTLS ??= ""
-# This should be set to MBEDTLS LIC FILES checksum
-LIC_FILES_CHKSUM_MBEDTLS ??= ""
-# add MBEDTLS to our sources if activated
-SRC_URI:append = " ${@bb.utils.contains('TFA_MBEDTLS', '1', '${SRC_URI_MBEDTLS}', '', d)}"
-# Update license variables
-LICENSE:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' AND Apache-2.0', '', d)}"
-LIC_FILES_CHKSUM:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' ${LIC_FILES_CHKSUM_MBEDTLS}', '', d)}"
-# add mbed TLS to version
-SRCREV_FORMAT:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', d)}"
-
-# Handle MBEDTLS
-EXTRA_OEMAKE += "${@bb.utils.contains('TFA_MBEDTLS', '1', 'MBEDTLS_DIR=${TFA_MBEDTLS_DIR}', '', d)}"
-
-# in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls
-# mbedtls-3.6.5
-SRCBRANCH_MBEDTLS = "mbedtls-3.6"
-SRC_URI_MBEDTLS = "gitsm://github.com/Mbed-TLS/mbedtls;name=mbedtls;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/mbedtls;branch=${SRCBRANCH_MBEDTLS}"
-SRCREV_mbedtls = "e185d7fd85499c8ce5ca2a54f5cf8fe7dbe3f8df"
-
-LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
-
-SRC_URI += "file://0001-feat-build-add-HOSTLDFLAGS-to-pass-flags-to-host-lin.patch"
new file mode 100644
@@ -0,0 +1,10 @@
+require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
+
+# TF-A v2.14.9
+SRC_URI_TRUSTED_FIRMWARE_A = "gitsm://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https"
+SRCREV_tfa = "16868ce4eafdbf7903fcd7eb15429d4e8b258de4"
+SRCBRANCH = "lts-v2.14"
+
+LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
+
+SRC_URI += "file://0001-feat-build-add-HOSTLDFLAGS-to-pass-flags-to-host-lin.patch"
Update the TF-A LTS recipes to the lts-v2.14.9 tag. This release adds mbedTLS as a submodule, matching how newer TF-A releases provide this dependency. This is a change from earlier releases in the 2.14 LTS series and requires the mbedTLS sources to be fetched as part of the TF-A source tree. Also update fiptool-native to use the corresponding TF-A 2.14.9 revision. Signed-off-by: Jon Mason <jon.mason@arm.com> --- ...ive_2.14.2.bb => fiptool-native_2.14.9.bb} | 4 +- .../trusted-firmware-a_2.14.2.bb | 38 ------------------- .../trusted-firmware-a_2.14.9.bb | 10 +++++ 3 files changed, 12 insertions(+), 40 deletions(-) rename meta-arm/recipes-bsp/trusted-firmware-a/{fiptool-native_2.14.2.bb => fiptool-native_2.14.9.bb} (92%) delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.2.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.9.bb