Build: Minor refine for build configurations
The patch includes 3 refines:
1. Removes deprecated TFM_LEGACY_API config
2. CORE_TEST_POSITIVE tests can be enabled only in TFM isolation
level 1. The check is currently done in the non_secure_suites.c.
This patch moves the check from source file to CMake file to
align with the other test suites.
3. Removes extra #if check for audit log test suite in source code.
The check has been done in CMake
Change-Id: I1b28f5f5139a0ff762f73334aadd38a931440b29
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
diff --git a/CommonConfig.cmake b/CommonConfig.cmake
index f107e9a..aea576a 100644
--- a/CommonConfig.cmake
+++ b/CommonConfig.cmake
@@ -145,7 +145,6 @@
set (TEST_FRAMEWORK_S OFF)
set (TEST_FRAMEWORK_NS OFF)
set (TFM_PSA_API OFF)
-set (TFM_LEGACY_API ON)
option(TFM_PARTITION_AUDIT_LOG "Enable the TF-M Audit Log partition" ON)
option(TFM_PARTITION_PLATFORM "Enable the TF-M Platform partition" ON)
@@ -207,17 +206,15 @@
endif()
endif()
-if (TFM_LEGACY_API)
- add_definitions(-DTFM_LEGACY_API)
-endif()
-
if (SERVICES_TEST_ENABLED)
set(SERVICE_TEST_S ON)
set(SERVICE_TEST_NS ON)
endif()
if (CORE_TEST)
- set(CORE_TEST_POSITIVE ON)
+ if (NOT CORE_IPC OR TFM_LVL EQUAL 1)
+ set(CORE_TEST_POSITIVE ON)
+ endif()
set(CORE_TEST_INTERACTIVE OFF)
endif()