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
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)
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)
diff --git a/test/secure_fw/common_test_services/tfm_secure_client_2/CMakeLists.txt b/test/secure_fw/common_test_services/tfm_secure_client_2/CMakeLists.txt
index 25530cb..f0ed0cd 100644
--- a/test/secure_fw/common_test_services/tfm_secure_client_2/CMakeLists.txt
+++ b/test/secure_fw/common_test_services/tfm_secure_client_2/CMakeLists.txt
@@ -16,14 +16,12 @@
# The generated sources
target_sources(tfm_app_rot_partition_secure_client_2
PRIVATE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_secure_client_2/auto_generated/intermedia_tfm_secure_client_2.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_secure_client_2/auto_generated/intermedia_tfm_secure_client_2.c
)
target_sources(tfm_partitions
INTERFACE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_secure_client_2/auto_generated/load_info_tfm_secure_client_2.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_secure_client_2/auto_generated/load_info_tfm_secure_client_2.c
)
# Set include directory
diff --git a/test/secure_fw/common_test_services/tfm_secure_client_service/CMakeLists.txt b/test/secure_fw/common_test_services/tfm_secure_client_service/CMakeLists.txt
index 98cc05b..7a9e845 100644
--- a/test/secure_fw/common_test_services/tfm_secure_client_service/CMakeLists.txt
+++ b/test/secure_fw/common_test_services/tfm_secure_client_service/CMakeLists.txt
@@ -17,14 +17,12 @@
# The generated sources
target_sources(tfm_psa_rot_partition_secure_client_service
PRIVATE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_secure_client_service/auto_generated/intermedia_tfm_secure_client_service.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_secure_client_service/auto_generated/intermedia_tfm_secure_client_service.c
)
target_sources(tfm_partitions
INTERFACE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_secure_client_service/auto_generated/load_info_tfm_secure_client_service.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_secure_client_service/auto_generated/load_info_tfm_secure_client_service.c
)
# Set include directory
@@ -53,38 +51,6 @@
tfm_psa_rot_partition_secure_client_service
)
-############################ NS API ############################################
-
-# As secure regression tests can run without non-secure client trigger in IPC
-# model now, function tfm_secure_client_service_api.c will be used only in
-# library model
-if(NS AND TFM_LIB_MODEL)
- target_sources(tfm_api_ns
- PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}/tfm_secure_client_service_api.c
- )
-
- # The veneers give warnings about not being properly declared so they get hidden
- # to not overshadow _real_ warnings.
- set_source_files_properties(tfm_secure_client_service_api.c
- PROPERTIES
- COMPILE_FLAGS -Wno-implicit-function-declaration
- )
-
- target_include_directories(tfm_api_ns
- PUBLIC
- .
- )
-endif()
-
-# Export test service non-secure interface API in Library model
-if(TFM_LIB_MODEL)
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tfm_secure_client_service_api.c
- DESTINATION ${TEST_SERVICE_SRC_INSTALL_DIR})
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tfm_secure_client_service_api.h
- DESTINATION ${TEST_SERVICE_INC_INSTALL_DIR})
-endif()
-
############################ Partition Defs ####################################
target_link_libraries(tfm_partitions
diff --git a/test/secure_fw/suites/core/service/tfm_core_test/CMakeLists.txt b/test/secure_fw/suites/core/service/tfm_core_test/CMakeLists.txt
index 7f75ba5..67ed5dd 100644
--- a/test/secure_fw/suites/core/service/tfm_core_test/CMakeLists.txt
+++ b/test/secure_fw/suites/core/service/tfm_core_test/CMakeLists.txt
@@ -16,14 +16,12 @@
# The generated sources
target_sources(tfm_psa_rot_partition_core_test
PRIVATE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_core_test/auto_generated/intermedia_tfm_ss_core_test.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_core_test/auto_generated/intermedia_tfm_ss_core_test.c
)
target_sources(tfm_partitions
INTERFACE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_core_test/auto_generated/load_info_tfm_ss_core_test.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_core_test/auto_generated/load_info_tfm_ss_core_test.c
)
# Set include directory
diff --git a/test/secure_fw/suites/core/service/tfm_core_test_2/CMakeLists.txt b/test/secure_fw/suites/core/service/tfm_core_test_2/CMakeLists.txt
index 8bb4443..5bdbb03 100644
--- a/test/secure_fw/suites/core/service/tfm_core_test_2/CMakeLists.txt
+++ b/test/secure_fw/suites/core/service/tfm_core_test_2/CMakeLists.txt
@@ -16,14 +16,12 @@
# The generated sources
target_sources(tfm_app_rot_partition_core_test_2
PRIVATE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_core_test_2/auto_generated/intermedia_tfm_ss_core_test_2.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_core_test_2/auto_generated/intermedia_tfm_ss_core_test_2.c
)
target_sources(tfm_partitions
INTERFACE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_core_test_2/auto_generated/load_info_tfm_ss_core_test_2.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_core_test_2/auto_generated/load_info_tfm_ss_core_test_2.c
)
# Set include directory
diff --git a/test/secure_fw/suites/fpu/service/CMakeLists.txt b/test/secure_fw/suites/fpu/service/CMakeLists.txt
index 4c43a49..d1f977d 100644
--- a/test/secure_fw/suites/fpu/service/CMakeLists.txt
+++ b/test/secure_fw/suites/fpu/service/CMakeLists.txt
@@ -21,14 +21,12 @@
# The generated sources
target_sources(tfm_app_rot_partition_fpu_service
PRIVATE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_fpu_service/auto_generated/intermedia_tfm_fpu_service_test.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_fpu_service/auto_generated/intermedia_tfm_fpu_service_test.c
)
target_sources(tfm_partitions
INTERFACE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_fpu_service/auto_generated/load_info_tfm_fpu_service_test.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_fpu_service/auto_generated/load_info_tfm_fpu_service_test.c
)
target_include_directories(tfm_app_rot_partition_fpu_service
diff --git a/test/secure_fw/suites/fwu/mcuboot/CMakeLists.txt b/test/secure_fw/suites/fwu/mcuboot/CMakeLists.txt
index f2d0dfe..26d97c6 100644
--- a/test/secure_fw/suites/fwu/mcuboot/CMakeLists.txt
+++ b/test/secure_fw/suites/fwu/mcuboot/CMakeLists.txt
@@ -34,7 +34,7 @@
target_compile_definitions(tfm_test_suite_fwu_ns
PRIVATE
DOMAIN_NS=1
- $<$<BOOL:${TFM_PSA_API}>:TFM_PSA_API>
+ TFM_PSA_API
$<$<BOOL:${TFM_FWU_TEST_WRITE_WITH_NULL}>:TFM_FWU_TEST_WRITE_WITH_NULL>
$<$<BOOL:${TFM_FWU_TEST_REQUEST_REBOOT}>:TFM_FWU_TEST_REQUEST_REBOOT>
$<$<BOOL:${TFM_FWU_TEST_QUERY_WITH_NULL}>:TFM_FWU_TEST_QUERY_WITH_NULL>
@@ -71,7 +71,7 @@
target_compile_definitions(tfm_test_suite_fwu_s
PRIVATE
- $<$<BOOL:${TFM_PSA_API}>:TFM_PSA_API>
+ TFM_PSA_API
$<$<BOOL:${TFM_FWU_TEST_WRITE_WITH_NULL}>:TFM_FWU_TEST_WRITE_WITH_NULL>
$<$<BOOL:${TFM_FWU_TEST_REQUEST_REBOOT}>:TFM_FWU_TEST_REQUEST_REBOOT>
$<$<BOOL:${TFM_FWU_TEST_QUERY_WITH_NULL}>:TFM_FWU_TEST_QUERY_WITH_NULL>
diff --git a/test/secure_fw/suites/ps/service/CMakeLists.txt b/test/secure_fw/suites/ps/service/CMakeLists.txt
index 00f0660..a7a1a8d 100644
--- a/test/secure_fw/suites/ps/service/CMakeLists.txt
+++ b/test/secure_fw/suites/ps/service/CMakeLists.txt
@@ -20,14 +20,12 @@
# The generated sources
target_sources(tfm_psa_rot_partition_ps_test
PRIVATE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_ps_test_service/auto_generated/intermedia_tfm_ps_test_service.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_ps_test_service/auto_generated/intermedia_tfm_ps_test_service.c
)
target_sources(tfm_partitions
INTERFACE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_ps_test_service/auto_generated/load_info_tfm_ps_test_service.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_ps_test_service/auto_generated/load_info_tfm_ps_test_service.c
)
# Set include directory
diff --git a/test/secure_fw/suites/spm/ipc/service/tfm_ipc_client/CMakeLists.txt b/test/secure_fw/suites/spm/ipc/service/tfm_ipc_client/CMakeLists.txt
index 7e3101a..cae2f2a 100644
--- a/test/secure_fw/suites/spm/ipc/service/tfm_ipc_client/CMakeLists.txt
+++ b/test/secure_fw/suites/spm/ipc/service/tfm_ipc_client/CMakeLists.txt
@@ -17,14 +17,12 @@
# The generated sources
target_sources(tfm_app_rot_partition_ipc_client
PRIVATE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_ipc_client/auto_generated/intermedia_tfm_ipc_client_test.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_ipc_client/auto_generated/intermedia_tfm_ipc_client_test.c
)
target_sources(tfm_partitions
INTERFACE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_ipc_client/auto_generated/load_info_tfm_ipc_client_test.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_ipc_client/auto_generated/load_info_tfm_ipc_client_test.c
)
# Set include directory
diff --git a/test/secure_fw/suites/spm/ipc/service/tfm_ipc_service/CMakeLists.txt b/test/secure_fw/suites/spm/ipc/service/tfm_ipc_service/CMakeLists.txt
index 76585aa..b291db4 100644
--- a/test/secure_fw/suites/spm/ipc/service/tfm_ipc_service/CMakeLists.txt
+++ b/test/secure_fw/suites/spm/ipc/service/tfm_ipc_service/CMakeLists.txt
@@ -18,16 +18,14 @@
# The generated sources
target_sources(tfm_psa_rot_partition_ipc_service
PRIVATE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_ipc_service/auto_generated/intermedia_tfm_ipc_service_test.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_ipc_service/auto_generated/intermedia_tfm_ipc_service_test.c
$<$<BOOL:${PSA_FRAMEWORK_HAS_MM_IOVEC}>:
${CMAKE_CURRENT_SOURCE_DIR}/../../../common/service/tfm_mmiovec_test_service.c>
)
target_sources(tfm_partitions
INTERFACE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_ipc_service/auto_generated/load_info_tfm_ipc_service_test.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_ipc_service/auto_generated/load_info_tfm_ipc_service_test.c
)
# Set include directory
diff --git a/test/secure_fw/suites/spm/irq/service/tfm_flih_test_service/CMakeLists.txt b/test/secure_fw/suites/spm/irq/service/tfm_flih_test_service/CMakeLists.txt
index 37e89b8..c4afefb 100644
--- a/test/secure_fw/suites/spm/irq/service/tfm_flih_test_service/CMakeLists.txt
+++ b/test/secure_fw/suites/spm/irq/service/tfm_flih_test_service/CMakeLists.txt
@@ -18,11 +18,9 @@
# The generated sources
target_sources(tfm_app_rot_partition_flih_test
PRIVATE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_flih_test_service/auto_generated/intermedia_tfm_flih_test_service.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_flih_test_service/auto_generated/intermedia_tfm_flih_test_service.c
INTERFACE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_flih_test_service/auto_generated/load_info_tfm_flih_test_service.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_flih_test_service/auto_generated/load_info_tfm_flih_test_service.c
)
target_include_directories(tfm_app_rot_partition_flih_test
diff --git a/test/secure_fw/suites/spm/irq/service/tfm_slih_test_service/CMakeLists.txt b/test/secure_fw/suites/spm/irq/service/tfm_slih_test_service/CMakeLists.txt
index cb60126..b6ffd13 100644
--- a/test/secure_fw/suites/spm/irq/service/tfm_slih_test_service/CMakeLists.txt
+++ b/test/secure_fw/suites/spm/irq/service/tfm_slih_test_service/CMakeLists.txt
@@ -18,11 +18,9 @@
# The generated sources
target_sources(tfm_app_rot_partition_slih_test
PRIVATE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_slih_test_service/auto_generated/intermedia_tfm_slih_test_service.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_slih_test_service/auto_generated/intermedia_tfm_slih_test_service.c
INTERFACE
- $<$<BOOL:${TFM_PSA_API}>:
- ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_slih_test_service/auto_generated/load_info_tfm_slih_test_service.c>
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/tfm_slih_test_service/auto_generated/load_info_tfm_slih_test_service.c
)
target_include_directories(tfm_app_rot_partition_slih_test