commit 2f072587dc8145980152328f67b0900bb0d51e67
author Mark Horvath <mark.horvath@arm.com> Fri Sep 09 16:15:30 2022 +0200
committer Ken Liu <ken.liu@arm.com> Thu Sep 15 09:55:15 2022 +0200
tree 48f5716882bd0df5089ef7efc283d39bb42feecf
parent 3e2ea7d3bdc8385407c74c2ea163071177d78300

Build: Remove handling of FORWARD_PROT_MSG option

Signed-off-by: Mark Horvath <mark.horvath@arm.com>
Change-Id: I26f9f0e3d3c1d85b5cbf11f4879c95ab0e3e9158

test/config/check_config.cmake

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))
 

test/config/set_config.cmake

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()