Build: Refine tfm_secure_api dependency routine
tfm_sprt linked platform_s and tfm_secure_api before. This has
been refined in TF-M repo. Thus irq services need to add these
two library dependency.
tfm_arch is linked by tfm_secure_api and it is unnecessary to link
it when tfm_seure_api is already linked.
Signed-off-by: Jianliang Shen <jianliang.shen@arm.com>
Change-Id: I49117fe99f779c515ac9b6464295e450fadd7395
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 ff779fb..1814912 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
@@ -44,7 +44,6 @@
tfm_secure_api
psa_interface
platform_s
- tfm_arch
)
target_link_libraries(tfm_spm
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 7b96f32..4c4bd45 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
@@ -45,7 +45,6 @@
psa_interface
platform_s
tfm_psa_rot_partition_core_test
- tfm_arch
)
target_link_libraries(tfm_spm
diff --git a/test/secure_fw/suites/fpu/service/CMakeLists.txt b/test/secure_fw/suites/fpu/service/CMakeLists.txt
index 038d210..ddc8e15 100644
--- a/test/secure_fw/suites/fpu/service/CMakeLists.txt
+++ b/test/secure_fw/suites/fpu/service/CMakeLists.txt
@@ -49,7 +49,6 @@
tfm_secure_api
platform_s
tfm_test_framework_s
- tfm_arch
)
target_link_libraries(tfm_spm
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 7cdcb33..54e1252 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
@@ -46,8 +46,8 @@
target_link_libraries(tfm_psa_rot_partition_ipc_service
PRIVATE
tfm_secure_api
+ psa_interface
platform_s
- tfm_arch
tfm_sprt
spm_test_service_common
)
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 8a65f77..569c1a9 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
@@ -36,6 +36,8 @@
psa_interface
tfm_sprt
spm_test_service_common
+ platform_s
+ tfm_secure_api
)
target_link_libraries(tfm_spm
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 8701875..3bf2f6a 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
@@ -36,6 +36,8 @@
psa_interface
tfm_sprt
spm_test_service_common
+ platform_s
+ tfm_secure_api
)
target_link_libraries(tfm_spm
diff --git a/test/secure_fw/suites/spm/sfn/service/sfn_backend_test_partition/CMakeLists.txt b/test/secure_fw/suites/spm/sfn/service/sfn_backend_test_partition/CMakeLists.txt
index 70d8cf0..6d991bb 100644
--- a/test/secure_fw/suites/spm/sfn/service/sfn_backend_test_partition/CMakeLists.txt
+++ b/test/secure_fw/suites/spm/sfn/service/sfn_backend_test_partition/CMakeLists.txt
@@ -35,7 +35,7 @@
target_include_directories(tfm_app_rot_partition_sfn_backend_test
PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- ${CMAKE_BINARY_DIR}/generated/test_services/sfn_backend_test_partition
+ ${CMAKE_BINARY_DIR}/generated/secure_fw/test_services/sfn_backend_test_partition
${CMAKE_CURRENT_SOURCE_DIR}/../../../common/service
${CMAKE_CURRENT_SOURCE_DIR}/../
)