Build: Merge tfm_partition_defs into tfm_config
CMake target tfm_partition_defs is merged into tfm_config. Same change
is also needed in tf-m-tests.
Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I79dc74d5acfc73a290f1288e3c0ecd76ab81be85
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 9b853cd..b991386 100755
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -60,7 +60,7 @@
# It can be replaced by NS side configurations later.
target_link_libraries(tfm_ns_interface
INTERFACE
- tfm_partition_defs
+ tfm_config
)
target_compile_definitions(tfm_ns_interface
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 f0ed0cd..853664b 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
@@ -69,7 +69,7 @@
tfm_app_rot_partition_secure_client_2
)
-target_compile_definitions(tfm_partition_defs
+target_compile_definitions(tfm_config
INTERFACE
TFM_PARTITION_TEST_SECURE_SERVICES
)
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 7a9e845..9e6e355 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
@@ -58,7 +58,7 @@
tfm_psa_rot_partition_secure_client_service
)
-target_compile_definitions(tfm_partition_defs
+target_compile_definitions(tfm_config
INTERFACE
TFM_PARTITION_TEST_SECURE_SERVICES
)
diff --git a/test/secure_fw/secure_tests.cmake b/test/secure_fw/secure_tests.cmake
index c16b8d1..64cf607 100644
--- a/test/secure_fw/secure_tests.cmake
+++ b/test/secure_fw/secure_tests.cmake
@@ -58,7 +58,7 @@
target_link_libraries(tfm_s_tests
INTERFACE
tfm_test_framework_s
- tfm_partition_defs
+ tfm_config
tfm_spm
)
diff --git a/test/secure_fw/suites/CMakeLists.txt b/test/secure_fw/suites/CMakeLists.txt
index 3158f00..a5acf64 100644
--- a/test/secure_fw/suites/CMakeLists.txt
+++ b/test/secure_fw/suites/CMakeLists.txt
@@ -43,7 +43,7 @@
target_link_libraries(tfm_ns_tests
INTERFACE
tfm_test_framework_ns
- tfm_partition_defs
+ tfm_config
)
target_compile_definitions(tfm_ns_tests
diff --git a/test/secure_fw/suites/fpu/service/CMakeLists.txt b/test/secure_fw/suites/fpu/service/CMakeLists.txt
index d1f977d..dfa1dba 100644
--- a/test/secure_fw/suites/fpu/service/CMakeLists.txt
+++ b/test/secure_fw/suites/fpu/service/CMakeLists.txt
@@ -61,7 +61,7 @@
tfm_app_rot_partition_fpu_service
)
-target_compile_definitions(tfm_partition_defs
+target_compile_definitions(tfm_config
INTERFACE
TEST_PARTITION_FPU_TEST
)
diff --git a/test/secure_fw/suites/ps/service/CMakeLists.txt b/test/secure_fw/suites/ps/service/CMakeLists.txt
index a7a1a8d..8599d80 100644
--- a/test/secure_fw/suites/ps/service/CMakeLists.txt
+++ b/test/secure_fw/suites/ps/service/CMakeLists.txt
@@ -74,7 +74,7 @@
tfm_psa_rot_partition_ps_test
)
-target_compile_definitions(tfm_partition_defs
+target_compile_definitions(tfm_config
INTERFACE
TFM_PARTITION_TEST_PS
)
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 cae2f2a..93f0c15 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
@@ -63,7 +63,7 @@
tfm_app_rot_partition_ipc_client
)
-target_compile_definitions(tfm_partition_defs
+target_compile_definitions(tfm_config
INTERFACE
TFM_PARTITION_TEST_CORE_IPC
)
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 b291db4..235094d 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
@@ -66,7 +66,7 @@
tfm_psa_rot_partition_ipc_service
)
-target_compile_definitions(tfm_partition_defs
+target_compile_definitions(tfm_config
INTERFACE
TFM_PARTITION_TEST_CORE_IPC
)
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 c4afefb..d0fd21d 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
@@ -56,7 +56,7 @@
tfm_app_rot_partition_flih_test
)
-target_compile_definitions(tfm_partition_defs
+target_compile_definitions(tfm_config
INTERFACE
$<$<BOOL:${TEST_NS_FLIH_IRQ}>:TEST_NS_FLIH_IRQ>
)
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 b6ffd13..d358e2d 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
@@ -56,7 +56,7 @@
tfm_app_rot_partition_slih_test
)
-target_compile_definitions(tfm_partition_defs
+target_compile_definitions(tfm_config
INTERFACE
$<$<BOOL:${TEST_NS_SLIH_IRQ}>:TEST_NS_SLIH_IRQ>
)