commit d13f55b70c656eebf7ff6882dbb295b273fe586b
author Summer Qin <summer.qin@arm.com> Sun Oct 09 11:29:57 2022 +0800
committer Summer Qin <summer.qin@arm.com> Wed Oct 19 11:33:10 2022 +0800
tree 655c3bdc4064292fbc552fe187da89fe234af019
parent e7b7317052a76aefb434bdd1d945818cc34b2a5f

Build: Remove Library Model branch in build system

Library Model is deprecated, so remove library model branch in build
system. TFM_PSA_API is defined as default and remove TFM_LIB_MODEL.

Signed-off-by: Summer Qin <summer.qin@arm.com>
Change-Id: I502f54b78d0c878356033efabed784e25284bc29

test/config/check_config.cmake

diff --git a/test/config/check_config.cmake b/test/config/check_config.cmake
index d0e5d05..efe10ac 100644
--- a/test/config/check_config.cmake
+++ b/test/config/check_config.cmake
@@ -52,12 +52,10 @@
 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((TEST_NS_IPC OR TEST_S_IPC OR TEST_NS_SLIH_IRQ OR TEST_NS_FLIH_IRQ) AND (TFM_LIB_MODEL))
 tfm_invalid_config((TEST_NS_IPC OR TEST_S_IPC OR TEST_NS_CORE) AND CONFIG_TFM_SPM_BACKEND_SFN)
 tfm_invalid_config(TEST_S_SFN_BACKEND AND CONFIG_TFM_SPM_BACKEND_IPC)
 
 tfm_invalid_config(CONFIG_TFM_FLOAT_ABI STREQUAL "soft" AND (TEST_S_FPU OR TEST_NS_FPU))
-tfm_invalid_config(TFM_LIB_MODEL AND (TEST_S_FPU OR TEST_NS_FPU OR TEST_S_SFN_BACKEND))
 tfm_invalid_config((NOT TFM_MULTI_CORE_TOPOLOGY) AND TEST_NS_MULTI_CORE)
 tfm_invalid_config(TEST_NS_T_COSE AND SYMMETRIC_INITIAL_ATTESTATION)
 tfm_invalid_config((NOT TFM_NS_MANAGE_NSID) AND TEST_NS_MANAGE_NSID)

test/config/set_config.cmake

diff --git a/test/config/set_config.cmake b/test/config/set_config.cmake
index 367e306..c615725 100644
--- a/test/config/set_config.cmake
+++ b/test/config/set_config.cmake
@@ -107,12 +107,12 @@
 ########################## SLIH/FLIH IRQ Test ##################################
 
 # Make FLIH IRQ test as the default IRQ test
-if (NOT TFM_LIB_MODEL AND PLATFORM_FLIH_IRQ_TEST_SUPPORT
+if (PLATFORM_FLIH_IRQ_TEST_SUPPORT
     AND TEST_NS AND NOT TEST_NS_SLIH_IRQ)
     set(TEST_NS_FLIH_IRQ        ON        CACHE BOOL      "Whether to build NS regression First-Level Interrupt Handling tests")
 endif()
 
-if (NOT TFM_LIB_MODEL AND PLATFORM_SLIH_IRQ_TEST_SUPPORT
+if (PLATFORM_SLIH_IRQ_TEST_SUPPORT
     AND TEST_NS AND NOT TEST_NS_FLIH_IRQ)
     set(TEST_NS_SLIH_IRQ        ON        CACHE BOOL      "Whether to build NS regression Second-Level Interrupt Handling tests")
 endif()
@@ -136,11 +136,6 @@
     set(TEST_S_SFN_BACKEND      ON        CACHE BOOL      "Whether to build S regression SFN backend tests")
 endif()
 
-######################### Library Model Specific Tests #########################
-if (TFM_LIB_MODEL AND TEST_NS)
-    set(TEST_NS_CORE            ON        CACHE BOOL      "Whether to build NS regression Core tests")
-endif()
-
 ########################## Load default config #################################
 
 if (TEST_S)