test(fvp): add test configs for cca CoT with RME
Signed-off-by: Lauren Wehrmeister <lauren.wehrmeister@arm.com>
Change-Id: I2f1c2bc493f483666942a4f06ef8cf3a02fc3ad8
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-mb-rme-romlib,fvp-default:fvp-trp.tftf-tftf.rme b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-mb-rme-romlib,fvp-default:fvp-trp.tftf-tftf.rme
new file mode 100644
index 0000000..0849ee7
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-mb-rme-romlib,fvp-default:fvp-trp.tftf-tftf.rme
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2022 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-default:fvp-trp.tftf-tftf.rme b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-default:fvp-trp.tftf-tftf.rme
new file mode 100644
index 0000000..0849ee7
--- /dev/null
+++ b/group/tf-l3-boot-tests-misc/fvp-tbb-mbedtls-rme-romlib,fvp-default:fvp-trp.tftf-tftf.rme
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2022 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index dead652..f974118 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -59,6 +59,9 @@
# Dualroot chain of trust.
clean_build $fvp_common_flags ${ARM_TBB_OPTIONS} SPD=tspd COT=dualroot
+# FEAT_RME with CCA chain of trust.
+clean_build $fvp_common_flags ${ARM_TBB_OPTIONS} SPD=tspd USE_ROMLIB=1 ENABLE_RME=1 MEASURED_BOOT=1
+
clean_build $fvp_common_flags SPD=trusty
clean_build $fvp_common_flags SPD=trusty TRUSTY_SPD_WITH_GENERIC_SERVICES=1
@@ -169,9 +172,6 @@
# PSA FWU support
clean_build $fvp_common_flags ${ARM_TBB_OPTIONS} ARM_GPT_SUPPORT=1 PSA_FWU_SUPPORT=1 USE_ROMLIB=1
-# FEAT_RME
-clean_build $fvp_common_flags ENABLE_RME=1
-
# SME and HCX features
clean_build $fvp_common_flags ENABLE_SME_FOR_NS=1 ENABLE_FEAT_HCX=1
diff --git a/tf_config/fvp-tbb-mbedtls-mb-rme-romlib b/tf_config/fvp-tbb-mbedtls-mb-rme-romlib
new file mode 100644
index 0000000..9080b3f
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-mb-rme-romlib
@@ -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
+TRUSTED_BOARD_BOOT=1
+ENABLE_RME=1
+FVP_HW_CONFIG_DTS=fdts/fvp-base-gicv3-psci-1t.dts
+USE_ROMLIB=1
+MEASURED_BOOT=1
diff --git a/tf_config/fvp-tbb-mbedtls-rme-romlib b/tf_config/fvp-tbb-mbedtls-rme-romlib
new file mode 100644
index 0000000..0120451
--- /dev/null
+++ b/tf_config/fvp-tbb-mbedtls-rme-romlib
@@ -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
+ENABLE_RME=1
+FVP_HW_CONFIG_DTS=fdts/fvp-base-gicv3-psci-1t.dts
+USE_ROMLIB=1