diff --git a/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-bl2-el3:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+bl2_el3-debug b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-bl2-el3:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+bl2_el3-debug
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-bl2-el3:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32+bl2_el3-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-dualroot,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32 b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-dualroot,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-dualroot,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-dualroot,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-dualroot,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-dualroot,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-ecdsa,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-ecdsa,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-ecdsa,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-ecdsa-cc,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.bmcov-debug b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-ecdsa-cc,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.bmcov-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-ecdsa-cc,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.bmcov-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-ecdsa:nil b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-ecdsa:nil
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-ecdsa:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-rsa-3k-cert,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-rsa-3k-cert,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-rsa-3k-cert,fvp-aarch32-fwu:fvp-tftf.aarch32+fwu-aemv8a.aarch32.NVM_reboot
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.nocache-debug b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.nocache-debug
new file mode 100644
index 0000000..867b20b
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.nocache-debug
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# Cache state modelling is disabled for this test as this particular TBBR config
+# thrashes the I-cache hard, leading to ~60% of CPU time spent in the host kernel
+# switching the pages responsible for the I-cache from writable to executable and
+# back again.
diff --git a/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert-cc,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.nocache.bmcov-debug b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert-cc,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.nocache.bmcov-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert-cc,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.aarch32.nocache.bmcov-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert:nil b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert:nil
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32 b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32-debug b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32-debug
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls:fvp-linux32-dtb.aarch32.1t-fip.uboot32-aemv8a.aarch32-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls:nil b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls:nil
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-aarch32-tbb-psa-mbedtls:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-r-tbb-psa-mbedtls:nil b/group/psa-mbedtls-fvp/fvp-r-tbb-psa-mbedtls:nil
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-r-tbb-psa-mbedtls:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-bl2-el3:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-bl2-el3:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-bl2-el3:fvp-linux-dtb.1t-fip.uboot-aemv8a.bl2_el3-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-cca-cot-in-dtb:nil b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-cca-cot-in-dtb:nil
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-cca-cot-in-dtb:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa,fvp-default:fvp-tftf-fip.tftf-aemv8a.tbb.disable_dyn_auth-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa,fvp-default:fvp-tftf-fip.tftf-aemv8a.tbb.disable_dyn_auth-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa,fvp-default:fvp-tftf-fip.tftf-aemv8a.tbb.disable_dyn_auth-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa,fvp-neg-boot:fvp-tftf.fwu-aemv8a b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa,fvp-neg-boot:fvp-tftf.fwu-aemv8a
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa,fvp-neg-boot:fvp-tftf.fwu-aemv8a
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.tbb.disable_dyn_auth.bmcov-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.tbb.disable_dyn_auth.bmcov-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.tbb.disable_dyn_auth.bmcov-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa-sha512,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa-sha512,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa-sha512,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa-sha512-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa-sha512-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa-sha512-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa-sha512:nil b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa-sha512:nil
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa-sha512:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa:nil b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa:nil
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ecdsa:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ext-pstate-tspd-tsp-dram:nil b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ext-pstate-tspd-tsp-dram:nil
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-ext-pstate-tspd-tsp-dram:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-full-dev-ecdsa-p256-key,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-full-dev-ecdsa-p256-key,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-full-dev-ecdsa-p256-key,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-full-dev-ecdsa-p384-key,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-full-dev-ecdsa-p384-key,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-full-dev-ecdsa-p384-key,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-full-dev-rsa-key,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-full-dev-rsa-key,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-full-dev-rsa-key,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-full-dev-rsa-key-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-full-dev-rsa-key-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-full-dev-rsa-key-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-no-cohmem:nil b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-no-cohmem:nil
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-no-cohmem:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-opteed-smc-load:nil b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-opteed-smc-load:nil
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-opteed-smc-load:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-opteed-sram:nil b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-opteed-sram:nil
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-opteed-sram:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-pncd:nil b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-pncd:nil
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-pncd:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rme-cot-in-dtb,fvp-rme:fvp-trp.tftf-tftf.rme b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rme-cot-in-dtb,fvp-rme:fvp-trp.tftf-tftf.rme
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rme-cot-in-dtb,fvp-rme:fvp-trp.tftf-tftf.rme
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-3k-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-3k-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-3k-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-3k-cert-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-3k-cert-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-3k-cert-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-4k-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-4k-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-4k-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-4k-cert-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-4k-cert-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-4k-cert-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert,fvp-default:fvp-tftf-fip.tftf-aemv8a-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.bmcov-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-tlkd:nil b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-tlkd:nil
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-tlkd:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-tsp-async-irq2el3-no-cohmem:nil b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-tsp-async-irq2el3-no-cohmem:nil
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-tsp-async-irq2el3-no-cohmem:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-tsp-async-irq2el3:nil b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-tsp-async-irq2el3:nil
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-tsp-async-irq2el3:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-tsp-async:nil b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-tsp-async:nil
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-tsp-async:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.invalid_nvcounter-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.invalid_nvcounter-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.invalid_nvcounter-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.nvcounter_v1-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.nvcounter_v1-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-upcounter,fvp-fwu:fvp-tftf.fwu-aemv8a.nvcounter_v1-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-upcounter-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.invalid_nvcounter.bmcov-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-upcounter-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.invalid_nvcounter.bmcov-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-upcounter-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.invalid_nvcounter.bmcov-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-upcounter-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.nvcounter_v1.bmcov-debug b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-upcounter-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.nvcounter_v1.bmcov-debug
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls-upcounter-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.nvcounter_v1.bmcov-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls:certificates.keys b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls:certificates.keys
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls:certificates.keys
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls:nil b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls:nil
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tbb-psa-mbedtls:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls,fvp-fwu:fvp-tftf.fwu-aemva b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls,fvp-fwu:fvp-tftf.fwu-aemva
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls,fvp-fwu:fvp-tftf.fwu-aemva
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov-debug b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov-debug
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-cc,fvp-fwu:fvp-tftf.fwu-aemv8a.bmcov-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot,fvp-default:fvp-tspd-tftf-fip.tftf-aemv8a b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot,fvp-default:fvp-tspd-tftf-fip.tftf-aemv8a
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot,fvp-default:fvp-tspd-tftf-fip.tftf-aemv8a
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot,fvp-fwu:fvp-tftf.fwu-aemv8a b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot,fvp-fwu:fvp-tftf.fwu-aemv8a
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot,fvp-fwu:fvp-tftf.fwu-aemv8a
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot-cot-in-dtb,fvp-default:fvp-tspd-tftf-fip.tftf-aemv8a b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot-cot-in-dtb,fvp-default:fvp-tspd-tftf-fip.tftf-aemv8a
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot-cot-in-dtb,fvp-default:fvp-tspd-tftf-fip.tftf-aemv8a
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot-cot-in-dtb:nil b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot-cot-in-dtb:nil
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot-cot-in-dtb:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot:nil b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot:nil
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-dualroot:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-ecdsa-dualroot,fvp-fwu:fvp-tftf.fwu-aemv8a b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-ecdsa-dualroot,fvp-fwu:fvp-tftf.fwu-aemv8a
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-ecdsa-dualroot,fvp-fwu:fvp-tftf.fwu-aemv8a
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-rsa-4k-cert,fvp-fwu:fvp-tftf.fwu-aemv8a b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-rsa-4k-cert,fvp-fwu:fvp-tftf.fwu-aemv8a
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-rsa-4k-cert,fvp-fwu:fvp-tftf.fwu-aemv8a
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-tsp-dram-no-cohmem:nil b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-tsp-dram-no-cohmem:nil
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-tsp-dram-no-cohmem:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-tsp-dram:nil b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-tsp-dram:nil
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls-tsp-dram:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x1a53x1-tspd-debug b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x1a53x1-tspd-debug
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x1a53x1-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x2a53x4-tspd-debug b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x2a53x4-tspd-debug
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x2a53x4-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:fvp-linux-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:fvp-linux.rootfs-dtb-fip.uboot-cortexa57x4a53x4-tspd-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:nil b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:nil
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:scan_build-tf b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:scan_build-tf
new file mode 100644
index 0000000..87ad7f5
--- /dev/null
+++ b/group/psa-mbedtls-fvp/fvp-tspd-tbb-psa-mbedtls:scan_build-tf
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/psa-mbedtls-fvp/imx8mm-mb_hash256-tbb-psa-mbedtls-debug:nil b/group/psa-mbedtls-fvp/imx8mm-mb_hash256-tbb-psa-mbedtls-debug:nil
new file mode 100644
index 0000000..e337bb0
--- /dev/null
+++ b/group/psa-mbedtls-fvp/imx8mm-mb_hash256-tbb-psa-mbedtls-debug:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/tf_config/fvp-aarch32-tbb-psa-mbedtls b/tf_config/fvp-aarch32-tbb-psa-mbedtls
new file mode 100644
index 0000000..cd4bd2b
--- /dev/null
+++ b/tf_config/fvp-aarch32-tbb-psa-mbedtls
@@ -0,0 +1,9 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=arm-none-eabi-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-aarch32-tbb-psa-mbedtls-bl2-el3 b/tf_config/fvp-aarch32-tbb-psa-mbedtls-bl2-el3
new file mode 100644
index 0000000..ef408ff
--- /dev/null
+++ b/tf_config/fvp-aarch32-tbb-psa-mbedtls-bl2-el3
@@ -0,0 +1,10 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ROTPK_LOCATION=devel_rsa
+RESET_TO_BL2=1
+CROSS_COMPILE=arm-none-eabi-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-aarch32-tbb-psa-mbedtls-cc b/tf_config/fvp-aarch32-tbb-psa-mbedtls-cc
new file mode 100644
index 0000000..28e7d54
--- /dev/null
+++ b/tf_config/fvp-aarch32-tbb-psa-mbedtls-cc
@@ -0,0 +1,10 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=arm-none-eabi-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+ENABLE_ASSERTIONS=0
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-aarch32-tbb-psa-mbedtls-dualroot b/tf_config/fvp-aarch32-tbb-psa-mbedtls-dualroot
new file mode 100644
index 0000000..0b0ac40
--- /dev/null
+++ b/tf_config/fvp-aarch32-tbb-psa-mbedtls-dualroot
@@ -0,0 +1,10 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=arm-none-eabi-
+COT=dualroot
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-aarch32-tbb-psa-mbedtls-dualroot-cc b/tf_config/fvp-aarch32-tbb-psa-mbedtls-dualroot-cc
new file mode 100644
index 0000000..b39a683
--- /dev/null
+++ b/tf_config/fvp-aarch32-tbb-psa-mbedtls-dualroot-cc
@@ -0,0 +1,11 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=arm-none-eabi-
+COT=dualroot
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+ENABLE_ASSERTIONS=0
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-aarch32-tbb-psa-mbedtls-ecdsa b/tf_config/fvp-aarch32-tbb-psa-mbedtls-ecdsa
new file mode 100644
index 0000000..295049c
--- /dev/null
+++ b/tf_config/fvp-aarch32-tbb-psa-mbedtls-ecdsa
@@ -0,0 +1,10 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ROTPK_LOCATION=devel_ecdsa
+CROSS_COMPILE=arm-none-eabi-
+GENERATE_COT=1
+KEY_ALG=ecdsa
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-aarch32-tbb-psa-mbedtls-ecdsa-cc b/tf_config/fvp-aarch32-tbb-psa-mbedtls-ecdsa-cc
new file mode 100644
index 0000000..503181e
--- /dev/null
+++ b/tf_config/fvp-aarch32-tbb-psa-mbedtls-ecdsa-cc
@@ -0,0 +1,11 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ROTPK_LOCATION=devel_ecdsa
+CROSS_COMPILE=arm-none-eabi-
+GENERATE_COT=1
+KEY_ALG=ecdsa
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TRUSTED_BOARD_BOOT=1
+ENABLE_ASSERTIONS=0
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-aarch32-tbb-psa-mbedtls-rsa-3k-cert b/tf_config/fvp-aarch32-tbb-psa-mbedtls-rsa-3k-cert
new file mode 100644
index 0000000..46026f1
--- /dev/null
+++ b/tf_config/fvp-aarch32-tbb-psa-mbedtls-rsa-3k-cert
@@ -0,0 +1,10 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=arm-none-eabi-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+KEY_SIZE=3072
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-aarch32-tbb-psa-mbedtls-rsa-3k-cert-cc b/tf_config/fvp-aarch32-tbb-psa-mbedtls-rsa-3k-cert-cc
new file mode 100644
index 0000000..35bb281
--- /dev/null
+++ b/tf_config/fvp-aarch32-tbb-psa-mbedtls-rsa-3k-cert-cc
@@ -0,0 +1,11 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=arm-none-eabi-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+KEY_SIZE=3072
+ENABLE_ASSERTIONS=0
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-aarch32-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert b/tf_config/fvp-aarch32-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert
new file mode 100644
index 0000000..bc289ee
--- /dev/null
+++ b/tf_config/fvp-aarch32-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert
@@ -0,0 +1,11 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ROTPK_LOCATION=devel_ecdsa
+CROSS_COMPILE=arm-none-eabi-
+GENERATE_COT=1
+KEY_ALG=rsa
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TF_MBEDTLS_KEY_ALG=rsa+ecdsa
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-aarch32-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert-cc b/tf_config/fvp-aarch32-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert-cc
new file mode 100644
index 0000000..9a14a99
--- /dev/null
+++ b/tf_config/fvp-aarch32-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert-cc
@@ -0,0 +1,12 @@
+AARCH32_SP=sp_min
+ARCH=aarch32
+ARM_ROTPK_LOCATION=devel_ecdsa
+CROSS_COMPILE=arm-none-eabi-
+GENERATE_COT=1
+KEY_ALG=rsa
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TF_MBEDTLS_KEY_ALG=rsa+ecdsa
+TRUSTED_BOARD_BOOT=1
+ENABLE_ASSERTIONS=0
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-r-tbb-psa-mbedtls b/tf_config/fvp-r-tbb-psa-mbedtls
new file mode 100644
index 0000000..5f91e34
--- /dev/null
+++ b/tf_config/fvp-r-tbb-psa-mbedtls
@@ -0,0 +1,7 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp_r
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-bl2-el3 b/tf_config/fvp-tbb-psa-mbedtls-bl2-el3
new file mode 100644
index 0000000..22e7bbb
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-bl2-el3
@@ -0,0 +1,9 @@
+ARM_ROTPK_LOCATION=devel_rsa
+RESET_TO_BL2=1
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-cca-cot-in-dtb b/tf_config/fvp-tbb-psa-mbedtls-cca-cot-in-dtb
new file mode 100644
index 0000000..cc5e809
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-cca-cot-in-dtb
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+COT=cca
+COT_DESC_IN_DTB=1
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-ecdsa-cc b/tf_config/fvp-tbb-psa-mbedtls-ecdsa-cc
new file mode 100644
index 0000000..9106977
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-ecdsa-cc
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+KEY_ALG=ecdsa
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TRUSTED_BOARD_BOOT=1
+ENABLE_ASSERTIONS=0
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-ecdsa-sha512 b/tf_config/fvp-tbb-psa-mbedtls-ecdsa-sha512
new file mode 100644
index 0000000..d3ddbf4
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-ecdsa-sha512
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+HASH_ALG=sha512
+KEY_ALG=ecdsa
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tbb-psa-mbedtls-ecdsa-sha512-cc b/tf_config/fvp-tbb-psa-mbedtls-ecdsa-sha512-cc
new file mode 100644
index 0000000..0e45487
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-ecdsa-sha512-cc
@@ -0,0 +1,11 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+HASH_ALG=sha512
+KEY_ALG=ecdsa
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TRUSTED_BOARD_BOOT=1
+ENABLE_ASSERTIONS=0
+PSA_CRYPTO=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tbb-psa-mbedtls-ext-pstate-tspd-tsp-dram b/tf_config/fvp-tbb-psa-mbedtls-ext-pstate-tspd-tsp-dram
new file mode 100644
index 0000000..f4eff24
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-ext-pstate-tspd-tsp-dram
@@ -0,0 +1,11 @@
+ARM_RECOM_STATE_ID_ENC=1
+ARM_ROTPK_LOCATION=devel_rsa
+ARM_TSP_RAM_LOCATION=dram
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+PLAT=fvp
+PSCI_EXTENDED_STATE_ID=1
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-full-dev-ecdsa-p256-key b/tf_config/fvp-tbb-psa-mbedtls-full-dev-ecdsa-p256-key
new file mode 100644
index 0000000..0e49314
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-full-dev-ecdsa-p256-key
@@ -0,0 +1,9 @@
+ARM_ROTPK_LOCATION=devel_full_dev_ecdsa_key
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+KEY_ALG=ecdsa
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tbb-psa-mbedtls-full-dev-ecdsa-p384-key b/tf_config/fvp-tbb-psa-mbedtls-full-dev-ecdsa-p384-key
index 30e98ce..e5155b1 100644
--- a/tf_config/fvp-tbb-psa-mbedtls-full-dev-ecdsa-p384-key
+++ b/tf_config/fvp-tbb-psa-mbedtls-full-dev-ecdsa-p384-key
@@ -8,3 +8,4 @@
 ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa_secp384r1.pem
 TRUSTED_BOARD_BOOT=1
 PSA_CRYPTO=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tbb-psa-mbedtls-full-dev-rsa-key b/tf_config/fvp-tbb-psa-mbedtls-full-dev-rsa-key
new file mode 100644
index 0000000..1fd09d1
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-full-dev-rsa-key
@@ -0,0 +1,9 @@
+ARM_ROTPK_LOCATION=devel_full_dev_rsa_key
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+KEY_ALG=rsa
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
+FVP_TRUSTED_SRAM_SIZE=384
\ No newline at end of file
diff --git a/tf_config/fvp-tbb-psa-mbedtls-full-dev-rsa-key-cc b/tf_config/fvp-tbb-psa-mbedtls-full-dev-rsa-key-cc
new file mode 100644
index 0000000..90f1060
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-full-dev-rsa-key-cc
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_full_dev_rsa_key
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+KEY_ALG=rsa
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+ENABLE_ASSERTIONS=0
+PSA_CRYPTO=1
+FVP_TRUSTED_SRAM_SIZE=384
\ No newline at end of file
diff --git a/tf_config/fvp-tbb-psa-mbedtls-mb-spm-rme b/tf_config/fvp-tbb-psa-mbedtls-mb-spm-rme
new file mode 100644
index 0000000..ef285a5
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-mb-spm-rme
@@ -0,0 +1,17 @@
+ARM_ROTPK_LOCATION=devel_rsa
+BRANCH_PROTECTION=1
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_FEAT_MTE2=1
+CTX_INCLUDE_PAUTH_REGS=1
+ENABLE_RME=1
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+MEASURED_BOOT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+SPD=spmd
+TRUSTED_BOARD_BOOT=1
+GIC_EXT_INTID=1
+PLAT_TEST_SPM=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-no-cohmem b/tf_config/fvp-tbb-psa-mbedtls-no-cohmem
new file mode 100644
index 0000000..27aec1d
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-no-cohmem
@@ -0,0 +1,9 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+USE_COHERENT_MEM=0
+PSA_CRYPTO=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tbb-psa-mbedtls-opteed-smc-load b/tf_config/fvp-tbb-psa-mbedtls-opteed-smc-load
new file mode 100644
index 0000000..0872805
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-opteed-smc-load
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+OPTEE_ALLOW_SMC_LOAD=1
+PLAT=fvp
+PLAT_XLAT_TABLES_DYNAMIC=1
+SPD=opteed
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-opteed-sram b/tf_config/fvp-tbb-psa-mbedtls-opteed-sram
new file mode 100644
index 0000000..7848200
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-opteed-sram
@@ -0,0 +1,8 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+PLAT=fvp
+SPD=opteed
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-pncd b/tf_config/fvp-tbb-psa-mbedtls-pncd
new file mode 100644
index 0000000..b514116
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-pncd
@@ -0,0 +1,11 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=pncd
+SPD_PNCD_NS_IRQ=126
+SPD_PNCD_S_IRQ=15
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-rme-cot-in-dtb b/tf_config/fvp-tbb-psa-mbedtls-rme-cot-in-dtb
new file mode 100644
index 0000000..f82d7e5
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-rme-cot-in-dtb
@@ -0,0 +1,11 @@
+ARM_ROTPK_LOCATION=devel_rsa
+COT_DESC_IN_DTB=1
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_RME=1
+FVP_HW_CONFIG_DTS=fdts/fvp-base-gicv3-psci-1t.dts
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-rsa-3k-cert b/tf_config/fvp-tbb-psa-mbedtls-rsa-3k-cert
new file mode 100644
index 0000000..b030669
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-rsa-3k-cert
@@ -0,0 +1,11 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+KEY_ALG=rsa
+KEY_SIZE=3072
+LOG_LEVEL=20
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-rsa-3k-cert-cc b/tf_config/fvp-tbb-psa-mbedtls-rsa-3k-cert-cc
new file mode 100644
index 0000000..701a2d9
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-rsa-3k-cert-cc
@@ -0,0 +1,12 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+KEY_ALG=rsa
+KEY_SIZE=3072
+LOG_LEVEL=20
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+ENABLE_ASSERTIONS=0
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-rsa-4k-cert b/tf_config/fvp-tbb-psa-mbedtls-rsa-4k-cert
new file mode 100644
index 0000000..d96cf87
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-rsa-4k-cert
@@ -0,0 +1,11 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+KEY_ALG=rsa
+KEY_SIZE=4096
+LOG_LEVEL=20
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-rsa-4k-cert-cc b/tf_config/fvp-tbb-psa-mbedtls-rsa-4k-cert-cc
new file mode 100644
index 0000000..6ef55b2
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-rsa-4k-cert-cc
@@ -0,0 +1,13 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+KEY_ALG=rsa
+KEY_SIZE=4096
+LOG_LEVEL=20
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TRUSTED_BOARD_BOOT=1
+ENABLE_ASSERTIONS=0
+PSA_CRYPTO=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert b/tf_config/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert
new file mode 100644
index 0000000..6f27205
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert
@@ -0,0 +1,12 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+KEY_ALG=rsa
+LOG_LEVEL=20
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TF_MBEDTLS_KEY_ALG=rsa+ecdsa
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert-cc b/tf_config/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert-cc
new file mode 100644
index 0000000..96ddc85
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-ecdsa-rotpk-rsa-cert-cc
@@ -0,0 +1,13 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+KEY_ALG=rsa
+LOG_LEVEL=20
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+TF_MBEDTLS_KEY_ALG=rsa+ecdsa
+TRUSTED_BOARD_BOOT=1
+ENABLE_ASSERTIONS=0
+PSA_CRYPTO=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert-cc b/tf_config/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert-cc
new file mode 100644
index 0000000..6ba7a25
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-rsa-ecdsa-with-rsa-rotpk-ecdsa-cert-cc
@@ -0,0 +1,13 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+KEY_ALG=ecdsa
+LOG_LEVEL=20
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TF_MBEDTLS_KEY_ALG=rsa+ecdsa
+TRUSTED_BOARD_BOOT=1
+ENABLE_ASSERTIONS=0
+PSA_CRYPTO=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tbb-psa-mbedtls-tlkd b/tf_config/fvp-tbb-psa-mbedtls-tlkd
new file mode 100644
index 0000000..d081f87
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-tlkd
@@ -0,0 +1,8 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+PLAT=fvp
+SPD=tlkd
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-tsp-async b/tf_config/fvp-tbb-psa-mbedtls-tsp-async
new file mode 100644
index 0000000..9f77216
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-tsp-async
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+TSP_INIT_ASYNC=1
+FVP_TRUSTED_SRAM_SIZE=384
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-tsp-async-irq2el3 b/tf_config/fvp-tbb-psa-mbedtls-tsp-async-irq2el3
new file mode 100644
index 0000000..30922ca
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-tsp-async-irq2el3
@@ -0,0 +1,12 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+NS_TIMER_SWITCH=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+TSP_INIT_ASYNC=1
+TSP_NS_INTR_ASYNC_PREEMPT=1
+FVP_TRUSTED_SRAM_SIZE=384
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-tsp-async-irq2el3-no-cohmem b/tf_config/fvp-tbb-psa-mbedtls-tsp-async-irq2el3-no-cohmem
new file mode 100644
index 0000000..9325de0
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-tsp-async-irq2el3-no-cohmem
@@ -0,0 +1,13 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+FVP_TRUSTED_SRAM_SIZE=384
+NS_TIMER_SWITCH=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+TSP_INIT_ASYNC=1
+TSP_NS_INTR_ASYNC_PREEMPT=1
+USE_COHERENT_MEM=0
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-upcounter b/tf_config/fvp-tbb-psa-mbedtls-upcounter
new file mode 100644
index 0000000..a47b335
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-upcounter
@@ -0,0 +1,9 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TFW_NVCTR_VAL=32
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tbb-psa-mbedtls-upcounter-cc b/tf_config/fvp-tbb-psa-mbedtls-upcounter-cc
new file mode 100644
index 0000000..cd28cd7
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-upcounter-cc
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+TFW_NVCTR_VAL=32
+TRUSTED_BOARD_BOOT=1
+ENABLE_ASSERTIONS=0
+PSA_CRYPTO=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tspd-tbb-psa-mbedtls b/tf_config/fvp-tspd-tbb-psa-mbedtls
new file mode 100644
index 0000000..60a2362
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-psa-mbedtls
@@ -0,0 +1,9 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+FVP_TRUSTED_SRAM_SIZE=384
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tspd-tbb-psa-mbedtls-cc b/tf_config/fvp-tspd-tbb-psa-mbedtls-cc
new file mode 100644
index 0000000..d2d191c
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-psa-mbedtls-cc
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+ENABLE_ASSERTIONS=0
+PSA_CRYPTO=1
+FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-tspd-tbb-psa-mbedtls-dualroot b/tf_config/fvp-tspd-tbb-psa-mbedtls-dualroot
new file mode 100644
index 0000000..76225d0
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-psa-mbedtls-dualroot
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+COT=dualroot
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+FVP_TRUSTED_SRAM_SIZE=384
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tspd-tbb-psa-mbedtls-dualroot-cc b/tf_config/fvp-tspd-tbb-psa-mbedtls-dualroot-cc
new file mode 100644
index 0000000..0e63c2a
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-psa-mbedtls-dualroot-cc
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+COT=dualroot
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+ENABLE_ASSERTIONS=0
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tspd-tbb-psa-mbedtls-dualroot-cot-in-dtb b/tf_config/fvp-tspd-tbb-psa-mbedtls-dualroot-cot-in-dtb
new file mode 100644
index 0000000..322d045
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-psa-mbedtls-dualroot-cot-in-dtb
@@ -0,0 +1,11 @@
+ARM_ROTPK_LOCATION=devel_rsa
+COT=dualroot
+COT_DESC_IN_DTB=1
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tspd-tbb-psa-mbedtls-ecdsa-dualroot b/tf_config/fvp-tspd-tbb-psa-mbedtls-ecdsa-dualroot
new file mode 100644
index 0000000..eab6a19
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-psa-mbedtls-ecdsa-dualroot
@@ -0,0 +1,13 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+COT=dualroot
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+KEY_ALG=ecdsa
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+SPD=tspd
+TF_MBEDTLS_KEY_ALG=rsa+ecdsa
+TRUSTED_BOARD_BOOT=1
+FVP_TRUSTED_SRAM_SIZE=384
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tspd-tbb-psa-mbedtls-ecdsa-dualroot-cc b/tf_config/fvp-tspd-tbb-psa-mbedtls-ecdsa-dualroot-cc
new file mode 100644
index 0000000..a2560cf
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-psa-mbedtls-ecdsa-dualroot-cc
@@ -0,0 +1,13 @@
+ARM_ROTPK_LOCATION=devel_ecdsa
+COT=dualroot
+CROSS_COMPILE=aarch64-none-elf-
+ENABLE_ASSERTIONS=0
+GENERATE_COT=1
+KEY_ALG=ecdsa
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem
+SPD=tspd
+TF_MBEDTLS_KEY_ALG=rsa+ecdsa
+TRUSTED_BOARD_BOOT=1
+ENABLE_ASSERTIONS=0
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tspd-tbb-psa-mbedtls-rsa-4k-cert b/tf_config/fvp-tspd-tbb-psa-mbedtls-rsa-4k-cert
new file mode 100644
index 0000000..eb63554
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-psa-mbedtls-rsa-4k-cert
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+KEY_SIZE=4096
+FVP_TRUSTED_SRAM_SIZE=384
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tspd-tbb-psa-mbedtls-rsa-4k-cert-cc b/tf_config/fvp-tspd-tbb-psa-mbedtls-rsa-4k-cert-cc
new file mode 100644
index 0000000..facbfe1
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-psa-mbedtls-rsa-4k-cert-cc
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+GENERATE_COT=1
+PLAT=fvp
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+KEY_SIZE=4096
+ENABLE_ASSERTIONS=0
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tspd-tbb-psa-mbedtls-tsp-dram b/tf_config/fvp-tspd-tbb-psa-mbedtls-tsp-dram
new file mode 100644
index 0000000..3644699
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-psa-mbedtls-tsp-dram
@@ -0,0 +1,9 @@
+ARM_ROTPK_LOCATION=devel_rsa
+ARM_TSP_RAM_LOCATION=dram
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+PLAT=fvp
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+PSA_CRYPTO=1
diff --git a/tf_config/fvp-tspd-tbb-psa-mbedtls-tsp-dram-no-cohmem b/tf_config/fvp-tspd-tbb-psa-mbedtls-tsp-dram-no-cohmem
new file mode 100644
index 0000000..0d075b8
--- /dev/null
+++ b/tf_config/fvp-tspd-tbb-psa-mbedtls-tsp-dram-no-cohmem
@@ -0,0 +1,10 @@
+ARM_ROTPK_LOCATION=devel_rsa
+ARM_TSP_RAM_LOCATION=dram
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+GENERATE_COT=1
+PLAT=fvp
+SPD=tspd
+TRUSTED_BOARD_BOOT=1
+USE_COHERENT_MEM=0
+PSA_CRYPTO=1
diff --git a/tf_config/imx8mm-mb_hash256-tbb-psa-mbedtls-debug b/tf_config/imx8mm-mb_hash256-tbb-psa-mbedtls-debug
new file mode 100644
index 0000000..146b4d6
--- /dev/null
+++ b/tf_config/imx8mm-mb_hash256-tbb-psa-mbedtls-debug
@@ -0,0 +1,9 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=imx8mm
+NEED_BL2=yes
+MEASURED_BOOT=1
+MBOOT_EL_HASH_ALG=sha256
+TRUSTED_BOARD_BOOT=1
+GENERATE_COT=1
+DEBUG=1
+PSA_CRYPTO=1