Build: Remove handling of FORWARD_PROT_MSG option
Signed-off-by: Mark Horvath <mark.horvath@arm.com>
Change-Id: I26f9f0e3d3c1d85b5cbf11f4879c95ab0e3e9158
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index dd5141b..c5571f4 100755
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -78,7 +78,6 @@
$<$<BOOL:${TFM_MULTI_CORE_TOPOLOGY}>:TFM_MULTI_CORE_TOPOLOGY>
$<$<BOOL:${TFM_MULTI_CORE_NS_OS}>:TFM_MULTI_CORE_NS_OS>
$<$<AND:$<BOOL:${TFM_MULTI_CORE_NS_OS_MAILBOX_THREAD}>,$<BOOL:${TFM_MULTI_CORE_NS_OS}>>:TFM_MULTI_CORE_NS_OS_MAILBOX_THREAD>
- $<$<BOOL:${FORWARD_PROT_MSG}>:FORWARD_PROT_MSG>
)
target_compile_options(tfm_ns_interface
@@ -97,11 +96,11 @@
if (TFM_PSA_API)
target_sources(tfm_api_ns PRIVATE
- $<$<OR:$<BOOL:${FORWARD_PROT_MSG}>,$<BOOL:${TFM_PARTITION_PLATFORM}>>:${INTERFACE_SRC_DIR}/tfm_platform_ipc_api.c>
- $<$<OR:$<BOOL:${FORWARD_PROT_MSG}>,$<BOOL:${TFM_PARTITION_PROTECTED_STORAGE}>>:${INTERFACE_SRC_DIR}/tfm_ps_ipc_api.c>
- $<$<OR:$<BOOL:${FORWARD_PROT_MSG}>,$<BOOL:${TFM_PARTITION_INTERNAL_TRUSTED_STORAGE}>>:${INTERFACE_SRC_DIR}/tfm_its_ipc_api.c>
- $<$<OR:$<BOOL:${FORWARD_PROT_MSG}>,$<BOOL:${TFM_PARTITION_CRYPTO}>>:${INTERFACE_SRC_DIR}/tfm_crypto_ipc_api.c>
- $<$<OR:$<BOOL:${FORWARD_PROT_MSG}>,$<BOOL:${TFM_PARTITION_INITIAL_ATTESTATION}>>:${INTERFACE_SRC_DIR}/tfm_initial_attestation_ipc_api.c>
+ $<$<BOOL:${TFM_PARTITION_PLATFORM}>:${INTERFACE_SRC_DIR}/tfm_platform_ipc_api.c>
+ $<$<BOOL:${TFM_PARTITION_PROTECTED_STORAGE}>:${INTERFACE_SRC_DIR}/tfm_ps_ipc_api.c>
+ $<$<BOOL:${TFM_PARTITION_INTERNAL_TRUSTED_STORAGE}>:${INTERFACE_SRC_DIR}/tfm_its_ipc_api.c>
+ $<$<BOOL:${TFM_PARTITION_CRYPTO}>:${INTERFACE_SRC_DIR}/tfm_crypto_ipc_api.c>
+ $<$<BOOL:${TFM_PARTITION_INITIAL_ATTESTATION}>:${INTERFACE_SRC_DIR}/tfm_initial_attestation_ipc_api.c>
$<$<BOOL:${TFM_PARTITION_FIRMWARE_UPDATE}>:${INTERFACE_SRC_DIR}/tfm_firmware_update_ipc_api.c>
)
diff --git a/docs/tfm_test_suites_addition.rst b/docs/tfm_test_suites_addition.rst
index aaf0cdb..99929c5 100644
--- a/docs/tfm_test_suites_addition.rst
+++ b/docs/tfm_test_suites_addition.rst
@@ -113,8 +113,7 @@
#. TF-M partitions configurations like ``TFM_PARTITION_CRYPTO``,
``TFM_PARTITION_INITIAL_ATTESTATION``, etc.
#. TF-M build mode configuration like ``TFM_LIB_MODEL``.
- #. TF-M other configurations like ``TFM_PARTITION_FIRMWARE_UPDATE``,
- ``FORWARD_PROT_MSG``, etc.
+ #. TF-M other configurations like ``TFM_PARTITION_FIRMWARE_UPDATE``, etc.
#. ``tf-m-tests/config/default_ns_test_config.cmake`` or
``tf-m-tests/config/default_s_test_config.cmake``: It is required to give
diff --git a/test/config/check_config.cmake b/test/config/check_config.cmake
index 41ea8c7..d0e5d05 100644
--- a/test/config/check_config.cmake
+++ b/test/config/check_config.cmake
@@ -44,11 +44,11 @@
########################## Check Flags Input ###################################
-tfm_invalid_config((NOT TFM_PARTITION_PROTECTED_STORAGE AND NOT FORWARD_PROT_MSG) AND (TEST_NS_PS OR TEST_S_PS))
-tfm_invalid_config((NOT TFM_PARTITION_INTERNAL_TRUSTED_STORAGE AND NOT FORWARD_PROT_MSG) AND (TEST_NS_ITS OR TEST_S_ITS OR TEST_NS_PS))
-tfm_invalid_config((NOT TFM_PARTITION_CRYPTO AND NOT FORWARD_PROT_MSG) AND (TEST_NS_CRYPTO OR TEST_S_CRYPTO))
-tfm_invalid_config((NOT TFM_PARTITION_INITIAL_ATTESTATION AND NOT FORWARD_PROT_MSG) AND (TEST_NS_ATTESTATION OR TEST_S_ATTESTATION OR TEST_NS_QCBOR OR TEST_NS_T_COSE))
-tfm_invalid_config((NOT TFM_PARTITION_PLATFORM AND NOT FORWARD_PROT_MSG) AND (TEST_NS_PLATFORM OR TEST_S_PLATFORM))
+tfm_invalid_config((NOT TFM_PARTITION_PROTECTED_STORAGE) AND (TEST_NS_PS OR TEST_S_PS))
+tfm_invalid_config((NOT TFM_PARTITION_INTERNAL_TRUSTED_STORAGE) AND (TEST_NS_ITS OR TEST_S_ITS OR TEST_NS_PS))
+tfm_invalid_config((NOT TFM_PARTITION_CRYPTO) AND (TEST_NS_CRYPTO OR TEST_S_CRYPTO))
+tfm_invalid_config((NOT TFM_PARTITION_INITIAL_ATTESTATION) AND (TEST_NS_ATTESTATION OR TEST_S_ATTESTATION OR TEST_NS_QCBOR OR TEST_NS_T_COSE))
+tfm_invalid_config((NOT TFM_PARTITION_PLATFORM) AND (TEST_NS_PLATFORM OR TEST_S_PLATFORM))
tfm_invalid_config(NOT TFM_PARTITION_FIRMWARE_UPDATE AND (TEST_NS_FWU OR TEST_S_FWU))
tfm_invalid_config(NOT TFM_PARTITION_AUDIT_LOG AND (TEST_NS_AUDIT OR TEST_S_AUDIT))
diff --git a/test/config/set_config.cmake b/test/config/set_config.cmake
index 4f563bb..367e306 100644
--- a/test/config/set_config.cmake
+++ b/test/config/set_config.cmake
@@ -7,12 +7,12 @@
########################## TEST SYNC ###########################################
-if ((NOT TFM_PARTITION_PROTECTED_STORAGE AND NOT FORWARD_PROT_MSG))
+if ((NOT TFM_PARTITION_PROTECTED_STORAGE))
set(TEST_NS_PS OFF CACHE BOOL "Whether to build NS regression PS tests")
set(TEST_S_PS OFF CACHE BOOL "Whether to build S regression PS tests")
endif()
-if (NOT TFM_PARTITION_INTERNAL_TRUSTED_STORAGE AND NOT FORWARD_PROT_MSG)
+if (NOT TFM_PARTITION_INTERNAL_TRUSTED_STORAGE)
set(TEST_NS_ITS OFF CACHE BOOL "Whether to build NS regression ITS tests")
set(TEST_S_ITS OFF CACHE BOOL "Whether to build S regression ITS tests")
@@ -20,12 +20,12 @@
set(TEST_NS_PS OFF CACHE BOOL "Whether to build NS regression PS tests")
endif()
-if (NOT TFM_PARTITION_CRYPTO AND NOT FORWARD_PROT_MSG)
+if (NOT TFM_PARTITION_CRYPTO)
set(TEST_NS_CRYPTO OFF CACHE BOOL "Whether to build NS regression Crypto tests")
set(TEST_S_CRYPTO OFF CACHE BOOL "Whether to build S regression Crypto tests")
endif()
-if (NOT TFM_PARTITION_INITIAL_ATTESTATION AND NOT FORWARD_PROT_MSG)
+if (NOT TFM_PARTITION_INITIAL_ATTESTATION)
set(TEST_NS_ATTESTATION OFF CACHE BOOL "Whether to build NS regression Attestation tests")
set(TEST_S_ATTESTATION OFF CACHE BOOL "Whether to build S regression Attestation tests")
set(TEST_NS_QCBOR OFF CACHE BOOL "Whether to build NS regression QCBOR tests")
@@ -36,7 +36,7 @@
set(TEST_NS_T_COSE OFF CACHE BOOL "Whether to build NS regression t_cose tests")
endif()
-if (NOT TFM_PARTITION_PLATFORM AND NOT FORWARD_PROT_MSG)
+if (NOT TFM_PARTITION_PLATFORM)
set(TEST_NS_PLATFORM OFF CACHE BOOL "Whether to build NS regression Platform tests")
set(TEST_S_PLATFORM OFF CACHE BOOL "Whether to build S regression Platform tests")
endif()
diff --git a/test/secure_fw/common_test_services/tfm_secure_client_2/tfm_secure_client_2.c b/test/secure_fw/common_test_services/tfm_secure_client_2/tfm_secure_client_2.c
index 5d72291..9925154 100644
--- a/test/secure_fw/common_test_services/tfm_secure_client_2/tfm_secure_client_2.c
+++ b/test/secure_fw/common_test_services/tfm_secure_client_2/tfm_secure_client_2.c
@@ -22,7 +22,7 @@
uint8_t *secure_client_2_data_p = &secure_client_2_data;
#endif
-#if defined(TFM_PARTITION_CRYPTO) || defined(FORWARD_PROT_MSG)
+#if defined(TFM_PARTITION_CRYPTO)
/**
* \brief Tests calling psa_destroy_key() with the supplied key handle.
*
@@ -45,9 +45,9 @@
/* Attempt to destroy the key handle */
return psa_destroy_key(key_handle);
}
-#endif /* defined(TFM_PARTITION_CRYPTO) || defined(FORWARD_PROT_MSG) */
+#endif /* defined(TFM_PARTITION_CRYPTO) */
-#if defined(TFM_PARTITION_INTERNAL_TRUSTED_STORAGE) || defined(FORWARD_PROT_MSG)
+#if defined(TFM_PARTITION_INTERNAL_TRUSTED_STORAGE)
/**
* \brief Tests calling psa_its_get() with the supplied uid.
*
@@ -72,7 +72,7 @@
/* Attempt to get one byte from the UID and return the resulting status */
return psa_its_get(uid, 0, sizeof(data), data, &p_data_length);
}
-#endif /* defined(TFM_PARTITION_INTERNAL_TRUSTED_STORAGE) || defined(FORWARD_PROT_MSG) */
+#endif /* defined(TFM_PARTITION_INTERNAL_TRUSTED_STORAGE) */
#ifdef TFM_IPC_ISOLATION_3_RETRIEVE_APP_MEM
/**
@@ -107,11 +107,11 @@
size_t arg_len)
{
switch (id) {
-#if defined(TFM_PARTITION_INTERNAL_TRUSTED_STORAGE) || defined(FORWARD_PROT_MSG)
+#if defined(TFM_PARTITION_INTERNAL_TRUSTED_STORAGE)
case TFM_SECURE_CLIENT_2_ID_ITS_ACCESS_CTRL:
return secure_client_2_test_its_access_ctrl(arg, arg_len);
#endif
-#if defined(TFM_PARTITION_CRYPTO) || defined(FORWARD_PROT_MSG)
+#if defined(TFM_PARTITION_CRYPTO)
case TFM_SECURE_CLIENT_2_ID_CRYPTO_ACCESS_CTRL:
return secure_client_2_test_crypto_access_ctrl(arg, arg_len);
#endif
diff --git a/test/secure_fw/suites/attestation/CMakeLists.txt b/test/secure_fw/suites/attestation/CMakeLists.txt
index b3dffc8..5234eeb 100644
--- a/test/secure_fw/suites/attestation/CMakeLists.txt
+++ b/test/secure_fw/suites/attestation/CMakeLists.txt
@@ -103,7 +103,7 @@
tfm_test_framework_s
tfm_attestation_defs
tfm_boot_status
- $<$<NOT:$<BOOL:${FORWARD_PROT_MSG}>>:tfm_psa_rot_partition_crypto>
+ tfm_psa_rot_partition_crypto
platform_s
)
diff --git a/test/secure_fw/suites/ps/CMakeLists.txt b/test/secure_fw/suites/ps/CMakeLists.txt
index a0cadcf..5fb9a93 100644
--- a/test/secure_fw/suites/ps/CMakeLists.txt
+++ b/test/secure_fw/suites/ps/CMakeLists.txt
@@ -59,12 +59,10 @@
$<$<BOOL:${PS_TEST_NV_COUNTERS}>:${CMAKE_CURRENT_SOURCE_DIR}/secure/ps_rollback_protection_testsuite.c>
)
-if (NOT FORWARD_PROT_MSG)
target_sources(tfm_app_rot_partition_ps
PRIVATE
$<$<BOOL:${PS_TEST_NV_COUNTERS}>:${CMAKE_CURRENT_SOURCE_DIR}/secure/nv_counters/test_ps_nv_counters.c>
)
-endif()
target_include_directories(tfm_test_suite_ps_s
PUBLIC
@@ -85,7 +83,7 @@
tfm_test_framework_s
platform_region_defs
tfm_app_rot_partition_ps
- $<$<NOT:$<BOOL:${FORWARD_PROT_MSG}>>:tfm_psa_rot_partition_ps_test>
+ tfm_psa_rot_partition_ps_test
tfm_spm
platform_s
)