similarity index 90%
rename from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.0.bb
rename to meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.1.bb
@@ -9,9 +9,9 @@ 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=83b7626b8c7a37263c6a58af8d19bee1"
-# Use fiptool from TF-A v2.12.0
-SRCREV = "4ec2948fe3f65dba2f19e691e702f7de2949179c"
-SRCBRANCH = "master"
+# Use fiptool from TF-A v2.12.1
+SRCREV = "8cf9edba5cc3ec11ed5463f206aa5819f7fdbade"
+SRCBRANCH = "lts-v2.12"
DEPENDS += "openssl-native"
similarity index 77%
rename from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.0.bb
rename to meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.1.bb
@@ -1,15 +1,15 @@
require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
-# TF-A v2.12.0
-SRCREV_tfa = "4ec2948fe3f65dba2f19e691e702f7de2949179c"
-SRCBRANCH = "master"
+# TF-A v2.12.1
+SRCREV_tfa = "8cf9edba5cc3ec11ed5463f206aa5819f7fdbade"
+SRCBRANCH = "lts-v2.12"
LIC_FILES_CHKSUM += "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1"
# in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls
-# mbedtls-3.6.1
+# mbedtls-3.6.2
SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-3.6"
-SRCREV_mbedtls = "71c569d44bf3a8bd53d874c81ee8ac644dd6e9e3"
+SRCREV_mbedtls = "107ea89daaefb9867ea9121002fbbdf926780e98"
LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
Update to the lts-v2.12.1 tag. Changes include a number of CVE fixes and mbedtls minor version bump: 8cf9edba5cc3 docs(changelog): changelog for lts-v2.12.1 release f5d048108bf3 Merge changes from topic "for-lts-v2.12.1" into lts-v2.12 56472775f96d docs(maintainers): update LTS maintainers baab55315c7f docs: updates to LTS f00f71efc410 docs: add inital lts doc 1a8ee82c6d77 Merge changes from topic "for-lts-v2.12.1" into lts-v2.12 b19ce90a908c fix(rd1ae): fix rd1-ae device tree 34f10e7d9fc7 feat(rd1ae): add Generic Timer in device tree 551dc4c09f57 docs(rd1ae): update documentation to include BL32 8e4240779867 feat(rd1ae): add support for OP-TEE SPMC 8e4bb69c747e feat(mbedtls): mbedtls config update for v3.6.2 a46d6a1320d7 docs(prerequisites): update mbedtls to version 3.6.2 2ffe181a3982 refactor(mbedtls): rename default mbedtls confs 3809359e2124 fix(cpus): workaround for Neoverse-V3 erratum 3701767 4a9ff092c9b4 fix(cpus): workaround for Neoverse-N3 erratum 3699563 7e41b706e97c fix(cpus): workaround for Neoverse-N2 erratum 3701773 15300ac30c55 fix(cpus): workaround for Cortex-X925 erratum 3701747 6e0efc7fe739 fix(cpus): workaround for Cortex-X4 erratum 3701758 8299c1274617 fix(cpus): workaround for Cortex-X3 erratum 3701769 fa6c9874485b fix(cpus): workaround for Cortex-X2 erratum 3701772 4e78288fd2bc fix(cpus): workaround for Cortex-A725 erratum 3699564 ae6edfd5b543 fix(cpus): workaround for Cortex-A720-AE erratum 3699562 24526273fc50 fix(cpus): workaround for Cortex-A720 erratum 3699561 a7b322706435 fix(cpus): workaround for Cortex-A715 erratum 3699560 d4826882210b fix(cpus): workaround for Cortex-A710 erratum 3701772 9d6143ec8ffb fix(cpus): workaround for accessing ICH_VMCR_EL2 7e4bf042a0dd chore(cpus): fix incorrect header macro 9427c061eb8d fix(security): apply SMCCC_ARCH_WORKAROUND_4 to affected cpus bea64fd5272d fix(security): add support in cpu_ops for CVE-2024-7881 16b87247ed03 fix(security): add CVE-2024-7881 mitigation to Cortex-X3 427c33bc0c0b fix(security): add CVE-2024-7881 mitigation to Neoverse-V3 192a152448ae fix(security): add CVE-2024-7881 mitigation to Neoverse-V2 3e4d94c43b64 fix(security): add CVE-2024-7881 mitigation to Cortex-X925 41a52efd6f38 fix(security): add CVE-2024-7881 mitigation to Cortex-X4 2f09b9f3c2af fix(security): enable WORKAROUND_CVE_2024_7881 build option 70a7d3f2d030 fix(cpus): workaround for CVE-2024-5660 for Cortex-X925 41b64fe36f42 fix(cpus): workaround for CVE-2024-5660 for Cortex-X2 0b2d22097c96 fix(cpus): workaround for CVE-2024-5660 for Cortex-A77 193370e1c6a2 fix(cpus): workaround for CVE-2024-5660 for Neoverse-V1 d52c52a5fa8c fix(cpus): workaround for CVE-2024-5660 for Cortex-A78_AE 3bd6531a55a4 fix(cpus): workaround for CVE-2024-5660 for Cortex-A78C eda09acd1b22 fix(cpus): workaround for CVE-2024-5660 for Cortex-A78 b9766da96365 fix(cpus): workaround for CVE-2024-5660 for Cortex-X1 6324220805b1 fix(cpus): workaround for CVE-2024-5660 for Neoverse-N2 6041f0723994 fix(cpus): workaround for CVE-2024-5660 for Cortex-A710 b23f5da614e6 fix(cpus): workaround for CVE-2024-5660 for Neoverse-V2 ef378713fa4b fix(cpus): workaround for CVE-2024-5660 for Cortex-X3 2898088f8ba6 fix(cpus): workaround for CVE-2024-5660 for Neoverse-V3 b8e111c72619 fix(cpus): workaround for CVE-2024-5660 for Cortex-X4 a6f6396313ea fix(cpus): workaround for Cortex-X4 erratum 2923985 d1c3a5d8b9d8 fix(build): do not force PLAT in plat_helpers.mk ea1b816b1763 chore(deps): update pytest for cot-dt2c 65762d7b4cfc chore(deps): bump jinja2 87f3125a0e45 chore(deps): bump jinja2 in the pip group across 1 directory b4530565c030 chore(deps): bump the pip group across 2 directories with 1 update 11e5f92d3d43 build(deps): bump setuptools in the pip group across 1 directory 850389f4acfe chore(deps): bump micromatch Signed-off-by: Jon Mason <jon.mason@arm.com> --- ...ptool-native_2.12.0.bb => fiptool-native_2.12.1.bb} | 6 +++--- ...rmware-a_2.12.0.bb => trusted-firmware-a_2.12.1.bb} | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) rename meta-arm/recipes-bsp/trusted-firmware-a/{fiptool-native_2.12.0.bb => fiptool-native_2.12.1.bb} (90%) rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.12.0.bb => trusted-firmware-a_2.12.1.bb} (77%)