commit c00020e1b55b034eab8e306418b390e37aa64ce1
author Kevin Peng <kevin.peng@arm.com> Wed Sep 15 13:58:56 2021 +0800
committer Kevin Peng <kevin.peng@arm.com> Fri Sep 17 10:12:26 2021 +0200
tree 2cadd5972b4e44e92f00e1dd12983faca875d6ea
parent caf5040f2477ab09d73d6add548ce94f536b894e

Build: Use TFM_LIB_MODEL in CMake Configurations

The new TFM_LIB_MODEL config is introduced to divide library and IPC
model. The TFM_PSA_API is not a user configuration anymore.

This patch uses TFM_LIB_MODEL instead of TFM_PSA_API in CMake
Configurations.

Note: The substitution is only required for "Config Type" CMake files.

Change-Id: I264c181712151728c12a78b486a714f7f4fe6e57
Signed-off-by: Kevin Peng <kevin.peng@arm.com>

test/config/check_config.cmake

diff --git a/test/config/check_config.cmake b/test/config/check_config.cmake
index cae376a..39d1346 100644
--- a/test/config/check_config.cmake
+++ b/test/config/check_config.cmake
@@ -45,7 +45,7 @@
 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_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))
-tfm_invalid_config((NOT TFM_PSA_API) AND (TEST_NS_IPC OR TEST_S_IPC OR TEST_NS_SLIH_IRQ OR TEST_NS_FLIH_IRQ))
+tfm_invalid_config((TFM_LIB_MODEL) AND (TEST_NS_IPC OR TEST_S_IPC OR TEST_NS_SLIH_IRQ OR TEST_NS_FLIH_IRQ))
 tfm_invalid_config((NOT TFM_MULTI_CORE_TOPOLOGY) AND TEST_NS_MULTI_CORE)
 tfm_invalid_config(TEST_NS_T_COSE AND SYMMETRIC_INITIAL_ATTESTATION)
 

test/config/set_config.cmake

diff --git a/test/config/set_config.cmake b/test/config/set_config.cmake
index 87a2bf2..629df30 100644
--- a/test/config/set_config.cmake
+++ b/test/config/set_config.cmake
@@ -51,7 +51,7 @@
     set(TEST_S_AUDIT            OFF        CACHE BOOL      "Whether to build S regression Audit log tests")
 endif()
 
-if (NOT TFM_PSA_API)
+if (TFM_LIB_MODEL)
     set(TEST_NS_IPC             OFF        CACHE BOOL      "Whether to build NS regression IPC tests")
     set(TEST_S_IPC              OFF        CACHE BOOL      "Whether to build S regression IPC tests")