diff mbox series

[2/7] arm/trusted-firmware-a: remove older LTS versions

Message ID 20260618125918.62619-2-jon.mason@arm.com
State New
Headers show
Series [1/7] arm/trusted-firmware-a: Add support for v2.15.0 | expand

Commit Message

Jon Mason June 18, 2026, 12:59 p.m. UTC 
The policy in meta-arm is to only have the latest version and the
latest LTS version.  Remove all of the older LTS versions to comply with
this policy.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 ci/lts-revisions.yml                          |   4 +-
 ...-make-PCIe-tests-default-for-testing.patch | 531 ------------------
 ...-handle-secure-SGI-at-EL1-for-OP-TEE.patch |  33 --
 ...ot.c-ignore-TPM-error-and-continue-w.patch |  33 --
 .../fiptool-native_2.10.30.bb                 |  33 --
 .../fiptool-native_2.12.10.bb                 |  33 --
 .../trusted-firmware-a/tf-a-tests_2.10.24.bb  |  54 --
 .../trusted-firmware-a/tf-a-tests_2.12.3.bb   |  56 --
 .../trusted-firmware-a_2.10.30.bb             |  23 -
 .../trusted-firmware-a_2.12.10.bb             |  22 -
 10 files changed, 2 insertions(+), 820 deletions(-)
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-realm-make-PCIe-tests-default-for-testing.patch
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.30.bb
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.10.bb
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.24.bb
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb
diff mbox series

Patch

diff --git a/ci/lts-revisions.yml b/ci/lts-revisions.yml
index 2cb7a6bc3411..0cd6ac074d9c 100644
--- a/ci/lts-revisions.yml
+++ b/ci/lts-revisions.yml
@@ -5,6 +5,6 @@  header:
 
 local_conf_header:
   latest_revisions: |
-    PREFERRED_VERSION_trusted-firmware-a ?= "2.10.%"
-    PREFERRED_VERSION_tf-a-tests ?= "2.10.%"
+    PREFERRED_VERSION_trusted-firmware-a ?= "2.14.%"
+    PREFERRED_VERSION_tf-a-tests ?= "2.14.%"
     PREFERRED_VERSION_trusted-firmware-m ?= "2.1.%"
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-realm-make-PCIe-tests-default-for-testing.patch b/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-realm-make-PCIe-tests-default-for-testing.patch
deleted file mode 100644
index f8f998a6a012..000000000000
--- a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-realm-make-PCIe-tests-default-for-testing.patch
+++ /dev/null
@@ -1,531 +0,0 @@ 
-From f5c206b8d9019d8112e55ac8da1936c79c7d2ce7 Mon Sep 17 00:00:00 2001
-From: Soby Mathew <soby.mathew@arm.com>
-Date: Fri, 15 Nov 2024 17:11:24 +0000
-Subject: [PATCH] fix(realm): make PCIe tests default for testing
-
-This patch moves the PCIe DOE test to the default realm world
-testsuite.
-
-Also fixes some build issues and hardens the PCIe functions.
-
-Note that FVP_Base_RevC model needs to have the following
-options enabled for the PCIe tests to work :
-
-    -C pci.pcie_rc.ahci0.endpoint.doe_supported=1
-    -C pci.pcie_rc.ahci0.endpoint.ide_supported=1
-
-Change-Id: Icfd6b68799b0bacb44299c6a3cf99a3c425f833d
-Signed-off-by: Soby Mathew <soby.mathew@arm.com>
-Upstream-Status: Backport [2c2810f79e57e78d77899084b5439cbdd1aaa464]
----
- docs/porting/optional-mods.rst                | 12 ++++++
- include/lib/pcie/pcie.h                       |  9 ++--
- include/plat/common/platform.h                | 10 ++++-
- lib/pcie/pcie.c                               | 41 ++++++++++++++-----
- plat/arm/fvp/fvp_pcie.c                       |  4 +-
- plat/arm/fvp/include/platform_pcie.h          |  2 -
- plat/arm/fvp/plat_setup.c                     |  2 -
- plat/arm/fvp/platform.mk                      |  9 ++--
- plat/common/plat_common.c                     |  8 +++-
- tftf/tests/doe_tests/doe_helpers.c            | 11 +++--
- tftf/tests/doe_tests/doe_helpers.h            |  2 +
- tftf/tests/doe_tests/test_doe.c               |  9 +++-
- .../realm_payload/host_realm_simd_common.h    |  2 +-
- tftf/tests/tests-pcie-doe.mk                  | 22 ----------
- tftf/tests/tests-pcie-doe.xml                 | 14 -------
- tftf/tests/tests-realm-payload.mk             | 14 ++++++-
- tftf/tests/tests-realm-payload.xml            |  7 +++-
- 17 files changed, 105 insertions(+), 73 deletions(-)
- delete mode 100644 tftf/tests/tests-pcie-doe.mk
- delete mode 100644 tftf/tests/tests-pcie-doe.xml
-
-diff --git a/docs/porting/optional-mods.rst b/docs/porting/optional-mods.rst
-index a88d682..7fc3813 100644
---- a/docs/porting/optional-mods.rst
-+++ b/docs/porting/optional-mods.rst
-@@ -50,6 +50,18 @@ The default implementation uses the ARM watchdog peripheral (`SP805`_) to
- generate a watchdog timeout interrupt. This interrupt remains deliberately
- unserviced, which eventually asserts the reset signal.
- 
-+Function : plat_pcie_get_info_table()
-+----------------------------
-+
-+::
-+
-+    Argument : void
-+    Return   : struct pcie_info_table *
-+
-+This function returns the pointer to `pcie_info_table` structure
-+correponding to the platform. This needs to be implemented
-+only if the platform want to run PCIe related tests.
-+
- --------------
- 
- *Copyright (c) 2019, Arm Limited. All rights reserved.*
-diff --git a/include/lib/pcie/pcie.h b/include/lib/pcie/pcie.h
-index aa3911f..3ce6986 100644
---- a/include/lib/pcie/pcie.h
-+++ b/include/lib/pcie/pcie.h
-@@ -11,6 +11,9 @@
- #include <stdint.h>
- #include <utils_def.h>
- 
-+/* platforms need to ensure that number of entries is less that this value */
-+#define MAX_PCIE_INFO_ENTRIES 5
-+
- typedef struct {
- 	unsigned long ecam_base;	/* ECAM base address */
- 	unsigned int segment_num;	/* Segment number of this ECAM */
-@@ -18,10 +21,10 @@ typedef struct {
- 	unsigned int end_bus_num;	/* Last bus number */
- } pcie_info_block_t;
- 
--typedef struct {
-+struct pcie_info_table{
- 	unsigned int num_entries;	/* Number of entries */
--	pcie_info_block_t block[];
--} pcie_info_table_t;
-+	pcie_info_block_t block[MAX_PCIE_INFO_ENTRIES];
-+};
- 
- typedef struct {
- 	uint32_t bdf;
-diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h
-index c8b785c..1a51823 100644
---- a/include/plat/common/platform.h
-+++ b/include/plat/common/platform.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
-+ * Copyright (c) 2018-2024, Arm Limited. All rights reserved.
-  *
-  * SPDX-License-Identifier: BSD-3-Clause
-  */
-@@ -193,4 +193,12 @@ static inline uint32_t get_current_core_id(void)
- 	return platform_get_core_pos(read_mpidr_el1() & MPID_MASK);
- }
- 
-+/* Forward declaration */
-+struct pcie_info_table;
-+
-+/*
-+ * Retrieve platform PCIe information.
-+ */
-+const struct pcie_info_table *plat_pcie_get_info_table(void);
-+
- #endif /* __PLATFORM_H__ */
-diff --git a/lib/pcie/pcie.c b/lib/pcie/pcie.c
-index c3906d5..5f8c97f 100644
---- a/lib/pcie/pcie.c
-+++ b/lib/pcie/pcie.c
-@@ -11,13 +11,12 @@
- #include <mmio.h>
- #include <pcie.h>
- #include <pcie_spec.h>
-+#include <platform.h>
- #include <tftf_lib.h>
- 
--#include <platform_pcie.h>
--
- #define PCIE_DEBUG	VERBOSE
- 
--const pcie_info_table_t *g_pcie_info_table;
-+const struct pcie_info_table *g_pcie_info_table;
- pcie_device_bdf_table_t *g_pcie_bdf_table;
- 
- pcie_device_bdf_table_t pcie_bdf_table[PCIE_DEVICE_BDF_TABLE_SZ];
-@@ -256,6 +255,8 @@ uint32_t pcie_get_rootport(uint32_t bdf, uint32_t *rp_bdf)
- 		return 1;
- 	}
- 
-+	assert(g_pcie_bdf_table != NULL);
-+
- 	while (index < g_pcie_bdf_table->num_entries) {
- 		*rp_bdf = g_pcie_bdf_table->device[index++].bdf;
- 
-@@ -294,6 +295,8 @@ static uint32_t pcie_populate_device_rootport(void)
- 	uint32_t bdf, rp_bdf;
- 	pcie_device_bdf_table_t *bdf_tbl_ptr = g_pcie_bdf_table;
- 
-+	assert(bdf_tbl_ptr != NULL);
-+
- 	for (unsigned int tbl_index = 0; tbl_index < bdf_tbl_ptr->num_entries;
- 								tbl_index++) {
- 		bdf = bdf_tbl_ptr->device[tbl_index].bdf;
-@@ -317,6 +320,8 @@ static uint32_t pcie_populate_device_rootport(void)
-  */
- pcie_device_bdf_table_t *pcie_get_bdf_table(void)
- {
-+	assert(g_pcie_bdf_table != NULL);
-+
- 	return g_pcie_bdf_table;
- }
- 
-@@ -336,6 +341,8 @@ void pcie_create_device_bdf_table(void)
- 	assert(g_pcie_bdf_table != NULL);
- 
- 	g_pcie_bdf_table->num_entries = 0;
-+
-+	assert(g_pcie_info_table != NULL);
- 	assert(g_pcie_info_table->num_entries != 0);
- 
- 	for (ecam_index = 0; ecam_index < g_pcie_info_table->num_entries; ecam_index++) {
-@@ -420,6 +427,8 @@ uintptr_t pcie_get_ecam_base(uint32_t bdf)
- 	uint32_t reg_value;
- 	uintptr_t ecam_base = 0;
- 
-+	assert(g_pcie_info_table != NULL);
-+
- 	while (ecam_index < g_pcie_info_table->num_entries) {
- 		/* Derive ECAM specific information */
- 		const pcie_info_block_t *block = &g_pcie_info_table->block[ecam_index];
-@@ -462,13 +471,15 @@ void pcie_print_device_info(void)
- 	uint32_t ecam_index = 0;
- 	uint32_t ecam_base, ecam_start_bus, ecam_end_bus;
- 	pcie_device_bdf_table_t *bdf_tbl_ptr = g_pcie_bdf_table;
--	uint32_t num_rciep = 0, num_rcec = 0;
--	uint32_t num_iep = 0, num_irp = 0;
--	uint32_t num_ep = 0, num_rp = 0;
--	uint32_t num_dp = 0, num_up = 0;
--	uint32_t num_pcie_pci = 0, num_pci_pcie = 0;
-+	uint32_t num_rciep __unused = 0, num_rcec __unused = 0;
-+	uint32_t num_iep __unused = 0, num_irp __unused = 0;
-+	uint32_t num_ep __unused = 0, num_rp __unused = 0;
-+	uint32_t num_dp __unused = 0, num_up __unused = 0;
-+	uint32_t num_pcie_pci __unused = 0, num_pci_pcie __unused = 0;
- 	uint32_t bdf_counter;
- 
-+	assert(bdf_tbl_ptr != NULL);
-+
- 	if (bdf_tbl_ptr->num_entries == 0) {
- 		INFO("BDF Table: No RCiEP or iEP found\n");
- 		return;
-@@ -525,6 +536,8 @@ void pcie_print_device_info(void)
- 	INFO("Number of PCI/PCIe Bridge: %u\n", num_pci_pcie);
- 	INFO("Number of PCIe/PCI Bridge: %u\n", num_pcie_pci);
- 
-+	assert(g_pcie_info_table != NULL);
-+
- 	while (ecam_index < g_pcie_info_table->num_entries) {
- 
- 		/* Derive ECAM specific information */
-@@ -540,7 +553,7 @@ void pcie_print_device_info(void)
- 
- 		while (tbl_index < bdf_tbl_ptr->num_entries) {
- 			uint32_t seg_num, bus_num, dev_num, func_num;
--			uint32_t device_id, vendor_id, reg_value;
-+			uint32_t device_id __unused, vendor_id __unused, reg_value;
- 			uint32_t bdf, dev_ecam_base;
- 
- 			bdf = bdf_tbl_ptr->device[tbl_index++].bdf;
-@@ -588,12 +601,18 @@ void pcie_create_info_table(void)
- 	INFO("Creating PCIe info table\n");
- 
- 	g_pcie_info_table = plat_pcie_get_info_table();
-+	if (g_pcie_info_table == NULL) {
-+		ERROR("PCIe info not returned by platform\n");
-+		panic();
-+	}
-+
- 	g_pcie_bdf_table = pcie_bdf_table;
- 
- 	num_ecam = g_pcie_info_table->num_entries;
- 	INFO("Number of ECAM regions   : %u\n", num_ecam);
--	if (num_ecam == 0) {
--		return;
-+	if ((num_ecam == 0) || (num_ecam > MAX_PCIE_INFO_ENTRIES)) {
-+		ERROR("PCIe info entries invalid\n");
-+		panic();
- 	}
- 	pcie_create_device_bdf_table();
- 	pcie_print_device_info();
-diff --git a/plat/arm/fvp/fvp_pcie.c b/plat/arm/fvp/fvp_pcie.c
-index 0569832..c43e42d 100644
---- a/plat/arm/fvp/fvp_pcie.c
-+++ b/plat/arm/fvp/fvp_pcie.c
-@@ -11,7 +11,7 @@
- 
- CASSERT(PLATFORM_NUM_ECAM != 0, PLATFORM_NUM_ECAM_is_zero);
- 
--const pcie_info_table_t fvp_pcie_cfg = {
-+const struct pcie_info_table fvp_pcie_cfg = {
- 	.num_entries = PLATFORM_NUM_ECAM,
- 	.block[0] = {
- 		PLATFORM_PCIE_ECAM_BASE_ADDR_0,
-@@ -21,7 +21,7 @@ const pcie_info_table_t fvp_pcie_cfg = {
- 	}
- };
- 
--const pcie_info_table_t *plat_pcie_get_info_table(void)
-+const struct pcie_info_table *plat_pcie_get_info_table(void)
- {
- 	return &fvp_pcie_cfg;
- }
-diff --git a/plat/arm/fvp/include/platform_pcie.h b/plat/arm/fvp/include/platform_pcie.h
-index c76c7d9..4b3a0e9 100644
---- a/plat/arm/fvp/include/platform_pcie.h
-+++ b/plat/arm/fvp/include/platform_pcie.h
-@@ -19,6 +19,4 @@
- #define PLATFORM_PCIE_START_BUS_NUM_0	0x0
- #define PLATFORM_PCIE_END_BUS_NUM_0	0xFF
- 
--const pcie_info_table_t *plat_pcie_get_info_table(void);
--
- #endif	/* PLATFORM_PCIE_H */
-diff --git a/plat/arm/fvp/plat_setup.c b/plat/arm/fvp/plat_setup.c
-index e6e4244..69cb0a1 100644
---- a/plat/arm/fvp/plat_setup.c
-+++ b/plat/arm/fvp/plat_setup.c
-@@ -35,9 +35,7 @@ static const mmap_region_t mmap[] = {
- #if USE_NVM
- 	MAP_REGION_FLAT(FLASH_BASE, FLASH_SIZE, MT_DEVICE | MT_RW | MT_NS),
- #endif
--#if USE_PCIE
- 	MAP_REGION_FLAT(PCIE_CONFIG_BASE, PCIE_CONFIG_SIZE, MT_DEVICE | MT_RW | MT_NS),
--#endif
- 	MAP_REGION_FLAT(DRAM_BASE, TFTF_BASE - DRAM_BASE, MT_MEMORY | MT_RW | MT_NS),
- 	{0}
- };
-diff --git a/plat/arm/fvp/platform.mk b/plat/arm/fvp/platform.mk
-index 7a2850f..ee30721 100644
---- a/plat/arm/fvp/platform.mk
-+++ b/plat/arm/fvp/platform.mk
-@@ -90,12 +90,8 @@ $(eval $(call add_define,NS_BL2U_DEFINES,PA_SIZE))
- $(eval $(call add_define,TFTF_DEFINES,PA_SIZE))
- $(eval $(call add_define,REALM_DEFINES,PA_SIZE))
- 
--ifeq ($(TESTS),pcie-doe)
--USE_PCIE=1
--$(eval $(call add_define,TFTF_DEFINES,USE_PCIE))
--endif
--
--PLAT_INCLUDES	+=	-Iplat/arm/fvp/include/
-+PLAT_INCLUDES	+=	-Iplat/arm/fvp/include/				\
-+			-Iinclude/lib/pcie/
- 
- PLAT_SOURCES	:=	drivers/arm/gic/arm_gic_v2v3.c			\
- 			drivers/arm/gic/gic_v2.c			\
-@@ -104,6 +100,7 @@ PLAT_SOURCES	:=	drivers/arm/gic/arm_gic_v2v3.c			\
- 			drivers/arm/timer/private_timer.c		\
- 			drivers/arm/timer/system_timer.c		\
- 			plat/arm/fvp/${ARCH}/plat_helpers.S		\
-+			plat/arm/fvp/fvp_pcie.c				\
- 			plat/arm/fvp/fvp_pwr_state.c			\
- 			plat/arm/fvp/fvp_topology.c			\
- 			plat/arm/fvp/fvp_mem_prot.c			\
-diff --git a/plat/common/plat_common.c b/plat/common/plat_common.c
-index c43ae12..a4195c3 100644
---- a/plat/common/plat_common.c
-+++ b/plat/common/plat_common.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
-+ * Copyright (c) 2018-2024, Arm Limited. All rights reserved.
-  *
-  * SPDX-License-Identifier: BSD-3-Clause
-  */
-@@ -24,6 +24,7 @@
- #pragma weak tftf_plat_enable_mmu
- #pragma weak tftf_plat_reset
- #pragma weak plat_get_prot_regions
-+#pragma weak plat_pcie_get_info_table
- 
- #if IMAGE_TFTF
- 
-@@ -148,3 +149,8 @@ const mem_region_t *plat_get_prot_regions(int *nelem)
- 	*nelem = 0;
- 	return NULL;
- }
-+
-+const struct pcie_info_table *plat_pcie_get_info_table(void)
-+{
-+	return NULL;
-+}
-diff --git a/tftf/tests/doe_tests/doe_helpers.c b/tftf/tests/doe_tests/doe_helpers.c
-index 28b6a86..911fbd0 100644
---- a/tftf/tests/doe_tests/doe_helpers.c
-+++ b/tftf/tests/doe_tests/doe_helpers.c
-@@ -13,12 +13,15 @@
- #include <pcie_doe.h>
- #include <spdm.h>
- 
--#include <platform_pcie.h>
--
- void pcie_init(void)
- {
-+	static bool is_init;
-+
- 	/* Create PCIe table and enumeration */
--	pcie_create_info_table();
-+	if (!is_init) {
-+		pcie_create_info_table();
-+		is_init = true;
-+	}
- }
- 
- /*
-@@ -113,7 +116,7 @@ int get_spdm_version(uint32_t bdf, uint32_t doe_cap_base)
- 			sizeof(ver_resp->version_number_entry_count));
- 
- 	while (entry_count-- != 0) {
--		spdm_version_number_t ver = *ver_ptr++;
-+		spdm_version_number_t ver __unused = *ver_ptr++;
- 
- 		INFO("SPDM v%llu.%llu.%llu.%llu\n",
- 			EXTRACT(SPDM_VER_MAJOR, ver),
-diff --git a/tftf/tests/doe_tests/doe_helpers.h b/tftf/tests/doe_tests/doe_helpers.h
-index 08137e3..d0fc5c8 100644
---- a/tftf/tests/doe_tests/doe_helpers.h
-+++ b/tftf/tests/doe_tests/doe_helpers.h
-@@ -8,6 +8,8 @@
- #ifndef DOE_HELPERS_H
- #define DOE_HELPERS_H
- 
-+#include <stdint.h>
-+
- void pcie_init(void);
- int find_doe_device(uint32_t *bdf_ptr, uint32_t *cap_base_ptr);
- int doe_discovery(uint32_t bdf, uint32_t doe_cap_base);
-diff --git a/tftf/tests/doe_tests/test_doe.c b/tftf/tests/doe_tests/test_doe.c
-index 6eb5079..cc852fa 100644
---- a/tftf/tests/doe_tests/test_doe.c
-+++ b/tftf/tests/doe_tests/test_doe.c
-@@ -10,6 +10,13 @@
- 
- #define SKIP_TEST_IF_DOE_NOT_SUPPORTED()					\
- 	do {									\
-+		/* Test PCIe DOE only for RME */				\
-+		if (!get_armv9_2_feat_rme_support()) {				\
-+			tftf_testcase_printf("FEAT_RME not supported\n");	\
-+			return TEST_RESULT_SKIPPED;				\
-+		}								\
-+										\
-+		pcie_init();							\
- 		if (find_doe_device(&bdf, &doe_cap_base) != 0) {		\
- 			tftf_testcase_printf("PCIe DOE not supported\n");	\
- 			return TEST_RESULT_SKIPPED;				\
-@@ -21,8 +28,6 @@ test_result_t doe_discovery_test(void)
- 	uint32_t bdf, doe_cap_base;
- 	int ret;
- 
--	pcie_init();
--
- 	SKIP_TEST_IF_DOE_NOT_SUPPORTED();
- 
- 	ret = doe_discovery(bdf, doe_cap_base);
-diff --git a/tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h b/tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h
-index 377c85b..6ab45c3 100644
---- a/tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h
-+++ b/tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h
-@@ -4,7 +4,7 @@
-  */
- 
- #ifndef HOST_REALM_COMMON_H
--#define HOST_REALM_COMMON_h
-+#define HOST_REALM_COMMON_H
- 
- #define NS_NORMAL_SVE		0x1U
- #define NS_STREAMING_SVE	0x2U
-diff --git a/tftf/tests/tests-pcie-doe.mk b/tftf/tests/tests-pcie-doe.mk
-deleted file mode 100644
-index 14bc9cf..0000000
---- a/tftf/tests/tests-pcie-doe.mk
-+++ /dev/null
-@@ -1,22 +0,0 @@
--#
--# Copyright (c) 2024, Arm Limited. All rights reserved.
--#
--# SPDX-License-Identifier: BSD-3-Clause
--#
--
--TESTS_SOURCES	+=			\
--	$(addprefix plat/arm/fvp/,	\
--		fvp_pcie.c		\
--	)
--
--TESTS_SOURCES	+=				\
--	$(addprefix tftf/tests/doe_tests/,	\
--		doe_helpers.c			\
--		test_doe.c			\
--	)
--
--TESTS_SOURCES	+=		\
--	$(addprefix lib/pcie/,	\
--		pcie.c		\
--		pcie_doe.c	\
--	)
-diff --git a/tftf/tests/tests-pcie-doe.xml b/tftf/tests/tests-pcie-doe.xml
-deleted file mode 100644
-index ed8b7cb..0000000
---- a/tftf/tests/tests-pcie-doe.xml
-+++ /dev/null
-@@ -1,14 +0,0 @@
--<?xml version="1.0" encoding="utf-8"?>
--
--<!--
--  Copyright (c) 2024, Arm Limited. All rights reserved.
--
--  SPDX-License-Identifier: BSD-3-Clause
---->
--
--<testsuites>
--  <testsuite name="PCI Data Object Exchange" description="Check PCI DOE support">
--     <testcase name="PCI DOE Discovery" function="doe_discovery_test" />
--     <testcase name="SPDM Get Version" function="spdm_version_test" />
--  </testsuite>
--</testsuites>
-diff --git a/tftf/tests/tests-realm-payload.mk b/tftf/tests/tests-realm-payload.mk
-index ae4b20a..4da8e3e 100644
---- a/tftf/tests/tests-realm-payload.mk
-+++ b/tftf/tests/tests-realm-payload.mk
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2021-2023, Arm Limited. All rights reserved.
-+# Copyright (c) 2021-2024, Arm Limited. All rights reserved.
- #
- # SPDX-License-Identifier: BSD-3-Clause
- #
-@@ -44,4 +44,16 @@ TESTS_SOURCES	+=							\
- 	$(addprefix lib/extensions/fpu/,				\
- 		fpu.c							\
- 	)
-+
-+TESTS_SOURCES	+=				\
-+	$(addprefix tftf/tests/doe_tests/,	\
-+		doe_helpers.c			\
-+		test_doe.c			\
-+	)
-+
-+TESTS_SOURCES	+=		\
-+	$(addprefix lib/pcie/,	\
-+		pcie.c		\
-+		pcie_doe.c	\
-+	)
- endif
-diff --git a/tftf/tests/tests-realm-payload.xml b/tftf/tests/tests-realm-payload.xml
-index 3c0dda4..d99a6b9 100644
---- a/tftf/tests/tests-realm-payload.xml
-+++ b/tftf/tests/tests-realm-payload.xml
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="utf-8"?>
- 
- <!--
--  Copyright (c) 2021-2023, Arm Limited. All rights reserved.
-+  Copyright (c) 2021-2024, Arm Limited. All rights reserved.
- 
-   SPDX-License-Identifier: BSD-3-Clause
- -->
-@@ -126,5 +126,10 @@
- 	  function="host_test_non_lpa2_realm_on_lpa2plat" />
- 	  <testcase name="Test Realm creation with LPA2 enabled but FEAT_LPA2 absent on platform"
- 	  function="host_test_lpa2_realm_on_non_lpa2plat" />
-+	  <!-- Test case related to PCIE-DOE -->
-+	  <testcase name="PCI DOE Discovery"
-+	  function="doe_discovery_test" />
-+	  <testcase name="SPDM Get Version"
-+	  function="spdm_version_test" />
-   </testsuite>
- </testsuites>
--- 
-2.34.1
-
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch b/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch
deleted file mode 100644
index 3dcc2de81c2f..000000000000
--- a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch
+++ /dev/null
@@ -1,33 +0,0 @@ 
-From f5b2fa90e0c0324f31e72429e7a7382f49a25912 Mon Sep 17 00:00:00 2001
-From: Shen Jiamin <shen_jiamin@comp.nus.edu.sg>
-Date: Wed, 24 Jul 2024 18:58:55 +0800
-Subject: [PATCH] fix(zynqmp): handle secure SGI at EL1 for OP-TEE
-
-OP-TEE requires SGIs to be handled at S-EL1. The
-Makefile was not properly setting the flag
-GICV2_G0_FOR_EL3 to 0 when the SPD is OP-TEE.
-
-Change-Id: I256afa37ddf4ad4a154c43d51807de670c3689bb
-Signed-off-by: Shen Jiamin <shen_jiamin@comp.nus.edu.sg>
----
- plat/xilinx/zynqmp/platform.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Upstream-Status: Backport
-
-diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk
-index c340009d0..22eceb621 100644
---- a/plat/xilinx/zynqmp/platform.mk
-+++ b/plat/xilinx/zynqmp/platform.mk
-@@ -21,7 +21,7 @@ ENABLE_LTO := 1
- EL3_EXCEPTION_HANDLING := $(SDEI_SUPPORT)
- 
- # pncd SPD requires secure SGI to be handled at EL1
--ifeq (${SPD}, $(filter ${SPD},pncd tspd))
-+ifeq (${SPD}, $(filter ${SPD},pncd tspd opteed))
- ifeq (${ZYNQMP_WDT_RESTART},1)
- $(error "Error: ZYNQMP_WDT_RESTART and SPD=pncd are incompatible")
- endif
--- 
-2.34.1
-
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch b/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch
deleted file mode 100644
index 733fa370b944..000000000000
--- a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch
+++ /dev/null
@@ -1,33 +0,0 @@ 
-From b91c651e6d596cfe27448b19c8fb2f1168493827 Mon Sep 17 00:00:00 2001
-From: Mikko Rapeli <mikko.rapeli@linaro.org>
-Date: Mon, 15 Jan 2024 09:26:56 +0000
-Subject: [PATCH] qemu_measured_boot.c: ignore TPM error and continue with boot
-
-If firmware is configured with TPM support but it's missing
-on HW, e.g. swtpm not started and/or configured with qemu,
-then continue booting. Missing TPM is not a fatal error.
-Enables testing boot without TPM device to see that
-missing TPM is detected further up the SW stack and correct
-fallback actions are taken.
-
-Upstream-Status: Submitted [https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/36514]
-
-Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
----
- plat/qemu/qemu/qemu_measured_boot.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/plat/qemu/qemu/qemu_measured_boot.c b/plat/qemu/qemu/qemu_measured_boot.c
-index 76a4da17e6a9..ec7f44d3720d 100644
---- a/plat/qemu/qemu/qemu_measured_boot.c
-+++ b/plat/qemu/qemu/qemu_measured_boot.c
-@@ -80,7 +80,8 @@ void bl2_plat_mboot_finish(void)
- 		 * Note: In QEMU platform, OP-TEE uses nt_fw_config to get the
- 		 * secure Event Log buffer address.
- 		 */
--		panic();
-+		ERROR("Ignoring TPM errors, continuing without\n");
-+		return;
- 	}
- 
- 	/* Copy Event Log to Non-secure memory */
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.30.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.30.bb
deleted file mode 100644
index deab9ad059bc..000000000000
--- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.30.bb
+++ /dev/null
@@ -1,33 +0,0 @@ 
-# Firmware Image Package (FIP)
-# It is a packaging format used by TF-A to package the
-# firmware images in a single binary.
-
-DESCRIPTION = "fiptool - Trusted Firmware tool for packaging"
-LICENSE = "BSD-3-Clause"
-
-SRC_URI_TRUSTED_FIRMWARE_A ?= "git://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https"
-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.30
-SRCREV = "d57b81079003e1647ed4181057c5784c7e3b1c3e"
-SRCBRANCH = "lts-v2.10"
-
-DEPENDS += "openssl-native"
-
-inherit native
-
-EXTRA_OEMAKE = "V=1 HOSTCC='${BUILD_CC}' OPENSSL_DIR=${STAGING_DIR_NATIVE}/${prefix_native}"
-
-do_compile () {
-    # This is still needed to have the native fiptool executing properly by
-    # setting the RPATH
-    sed -i '/^LDOPTS/ s,$, \$\{BUILD_LDFLAGS},' ${S}/tools/fiptool/Makefile
-    sed -i '/^INCLUDE_PATHS/ s,$, \$\{BUILD_CFLAGS},' ${S}/tools/fiptool/Makefile
-
-    oe_runmake fiptool
-}
-
-do_install () {
-    install -D -p -m 0755 tools/fiptool/fiptool ${D}${bindir}/fiptool
-}
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.10.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.10.bb
deleted file mode 100644
index 985fd4c2ca6c..000000000000
--- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.10.bb
+++ /dev/null
@@ -1,33 +0,0 @@ 
-# Firmware Image Package (FIP)
-# It is a packaging format used by TF-A to package the
-# firmware images in a single binary.
-
-DESCRIPTION = "fiptool - Trusted Firmware tool for packaging"
-LICENSE = "BSD-3-Clause"
-
-SRC_URI_TRUSTED_FIRMWARE_A ?= "git://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https"
-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.10
-SRCREV = "9487b105dcf18d057c6aeb405f9eaa1079c8fe6e"
-SRCBRANCH = "lts-v2.12"
-
-DEPENDS += "openssl-native"
-
-inherit native
-
-EXTRA_OEMAKE = "V=1 HOSTCC='${BUILD_CC}' OPENSSL_DIR=${STAGING_DIR_NATIVE}/${prefix_native}"
-
-do_compile () {
-    # This is still needed to have the native fiptool executing properly by
-    # setting the RPATH
-    sed -i '/^LDOPTS/ s,$, \$\{BUILD_LDFLAGS},' ${S}/tools/fiptool/Makefile
-    sed -i '/^INCLUDE_PATHS/ s,$, \$\{BUILD_CFLAGS},' ${S}/tools/fiptool/Makefile
-
-    oe_runmake fiptool
-}
-
-do_install () {
-    install -D -p -m 0755 tools/fiptool/fiptool ${D}${bindir}/fiptool
-}
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.24.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.24.bb
deleted file mode 100644
index b2691122cc09..000000000000
--- a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.24.bb
+++ /dev/null
@@ -1,54 +0,0 @@ 
-DESCRIPTION = "Trusted Firmware-A tests(aka TFTF)"
-LICENSE = "BSD-3-Clause & NCSA"
-
-LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6175cc0aa2e63b6d21a32aa0ee7d1b4a"
-
-inherit deploy
-
-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 = "ad8e3c9506abc6fd093c9753c8e201ddc2daa270"
-
-EXTRA_OEMAKE += "USE_NVM=0"
-EXTRA_OEMAKE += "SHELL_COLOR=1"
-EXTRA_OEMAKE += "DEBUG=1"
-
-# Modify mode based on debug or release mode
-TFTF_MODE ?= "debug"
-
-# Platform must be set for each machine
-TFA_PLATFORM ?= "invalid"
-
-EXTRA_OEMAKE += "ARCH=aarch64"
-EXTRA_OEMAKE += "LOG_LEVEL=50"
-
-B = "${WORKDIR}/build"
-
-# Add platform parameter
-EXTRA_OEMAKE += "BUILD_BASE=${B} PLAT=${TFA_PLATFORM}"
-
-# Requires CROSS_COMPILE set by hand as there is no configure script
-export CROSS_COMPILE = "${TARGET_PREFIX}"
-
-LDFLAGS[unexport] = "1"
-do_compile() {
-    oe_runmake -C ${S} tftf
-}
-
-do_compile[cleandirs] = "${B}"
-
-FILES:${PN} = "/firmware/tftf.bin"
-SYSROOT_DIRS += "/firmware"
-
-do_install() {
-    install -d -m 755 ${D}/firmware
-    install -m 0644 ${B}/${TFA_PLATFORM}/${TFTF_MODE}/tftf.bin ${D}/firmware/tftf.bin
-}
-
-do_deploy() {
-    cp -rf ${D}/firmware/* ${DEPLOYDIR}/
-}
-addtask deploy after do_install
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb
deleted file mode 100644
index ecd02f67cd44..000000000000
--- a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb
+++ /dev/null
@@ -1,56 +0,0 @@ 
-DESCRIPTION = "Trusted Firmware-A tests(aka TFTF)"
-LICENSE = "BSD-3-Clause & NCSA"
-
-LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6175cc0aa2e63b6d21a32aa0ee7d1b4a"
-
-inherit deploy
-
-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} \
-          file://0001-fix-realm-make-PCIe-tests-default-for-testing.patch \
-          "
-SRCBRANCH = "lts-v2.12"
-SRCREV = "3650d9cdfaa8eda20eba4b0c366c7c213a356557"
-
-EXTRA_OEMAKE += "USE_NVM=0"
-EXTRA_OEMAKE += "SHELL_COLOR=1"
-EXTRA_OEMAKE += "DEBUG=1"
-
-# Modify mode based on debug or release mode
-TFTF_MODE ?= "debug"
-
-# Platform must be set for each machine
-TFA_PLATFORM ?= "invalid"
-
-EXTRA_OEMAKE += "ARCH=aarch64"
-EXTRA_OEMAKE += "LOG_LEVEL=50"
-
-B = "${WORKDIR}/build"
-
-# Add platform parameter
-EXTRA_OEMAKE += "BUILD_BASE=${B} PLAT=${TFA_PLATFORM}"
-
-# Requires CROSS_COMPILE set by hand as there is no configure script
-export CROSS_COMPILE = "${TARGET_PREFIX}"
-
-LDFLAGS[unexport] = "1"
-do_compile() {
-    oe_runmake -C ${S} tftf
-}
-
-do_compile[cleandirs] = "${B}"
-
-FILES:${PN} = "/firmware/tftf.bin"
-SYSROOT_DIRS += "/firmware"
-
-do_install() {
-    install -d -m 755 ${D}/firmware
-    install -m 0644 ${B}/${TFA_PLATFORM}/${TFTF_MODE}/tftf.bin ${D}/firmware/tftf.bin
-}
-
-do_deploy() {
-    cp -rf ${D}/firmware/* ${DEPLOYDIR}/
-}
-addtask deploy after do_install
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb
deleted file mode 100644
index 72dd4b09cc7c..000000000000
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb
+++ /dev/null
@@ -1,23 +0,0 @@ 
-require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
-
-# 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.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 = "c765c831e5c2a0971410692f92f7a81d6ec65ec2"
-# The default value changed in v2.15.0 and later.  Given this is a legacy version, change it here to keep future versions simplier
-TFA_MBEDTLS_DIR = "mbedtls"
-
-LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
-
-# continue to boot also without TPM
-SRC_URI += "\
-    file://0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch \
-    file://0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch \
-"
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb
deleted file mode 100644
index 737a90a70e15..000000000000
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb
+++ /dev/null
@@ -1,22 +0,0 @@ 
-require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
-
-# TF-A v2.12.10
-SRCREV_tfa = "9487b105dcf18d057c6aeb405f9eaa1079c8fe6e"
-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.3
-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"
-# The default value changed in v2.15.0 and later.  Given this is a legacy version, change it here to keep future versions simplier
-TFA_MBEDTLS_DIR = "mbedtls"
-
-LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
-
-# continue to boot also without TPM
-SRC_URI += "\
-    file://0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch \
-"