Build: Seucre Partitions links tfm_sprt only
This is a corresponding change of tfm_secure_api and tfm_sp_log_raw
merging into tfm_sprt.
Change-Id: Ie1dd207f4b286367d65fbdadf3dc1828917992e1
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
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 34abccd..25530cb 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
@@ -41,8 +41,7 @@
target_link_libraries(tfm_app_rot_partition_secure_client_2
PRIVATE
- tfm_secure_api
- psa_interface
+ tfm_sprt
platform_s
)
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 8e50b61..98cc05b 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
@@ -42,8 +42,7 @@
target_link_libraries(tfm_psa_rot_partition_secure_client_service
PRIVATE
- tfm_secure_api
- psa_interface
+ tfm_sprt
platform_s
tfm_test_framework_s
tfm_s_tests
diff --git a/test/secure_fw/secure_tests.cmake b/test/secure_fw/secure_tests.cmake
index f071623..74a4431 100644
--- a/test/secure_fw/secure_tests.cmake
+++ b/test/secure_fw/secure_tests.cmake
@@ -43,7 +43,7 @@
INTERFACE
psa_interface
tfm_test_framework_common
- tfm_sp_log_raw
+ tfm_sprt
)
target_compile_definitions(tfm_test_framework_s
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 1814912..7f75ba5 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
@@ -41,8 +41,7 @@
target_link_libraries(tfm_psa_rot_partition_core_test
PRIVATE
- tfm_secure_api
- psa_interface
+ tfm_sprt
platform_s
)
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 4c4bd45..8bb4443 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
@@ -41,8 +41,7 @@
target_link_libraries(tfm_app_rot_partition_core_test_2
PRIVATE
- tfm_secure_api
- psa_interface
+ tfm_sprt
platform_s
tfm_psa_rot_partition_core_test
)
diff --git a/test/secure_fw/suites/crypto/CMakeLists.txt b/test/secure_fw/suites/crypto/CMakeLists.txt
index d79d1ba..355abf7 100644
--- a/test/secure_fw/suites/crypto/CMakeLists.txt
+++ b/test/secure_fw/suites/crypto/CMakeLists.txt
@@ -77,7 +77,6 @@
target_link_libraries(tfm_test_suite_crypto_s
PRIVATE
- tfm_secure_api
tfm_test_framework_s
tfm_app_rot_partition_secure_client_2
platform_s
diff --git a/test/secure_fw/suites/extra/CMakeLists.txt b/test/secure_fw/suites/extra/CMakeLists.txt
index de49774..96090c1 100644
--- a/test/secure_fw/suites/extra/CMakeLists.txt
+++ b/test/secure_fw/suites/extra/CMakeLists.txt
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2021, Arm Limited. All rights reserved.
+# Copyright (c) 2021-2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -80,7 +80,6 @@
target_link_libraries(tfm_test_suite_extra_s
PRIVATE
tfm_test_framework_s
- tfm_secure_api
platform_s
tfm_test_suite_extra_common
)
diff --git a/test/secure_fw/suites/fpu/service/CMakeLists.txt b/test/secure_fw/suites/fpu/service/CMakeLists.txt
index ddc8e15..4c43a49 100644
--- a/test/secure_fw/suites/fpu/service/CMakeLists.txt
+++ b/test/secure_fw/suites/fpu/service/CMakeLists.txt
@@ -46,7 +46,7 @@
target_link_libraries(tfm_app_rot_partition_fpu_service
PRIVATE
- tfm_secure_api
+ tfm_sprt
platform_s
tfm_test_framework_s
)
diff --git a/test/secure_fw/suites/fwu/mcuboot/CMakeLists.txt b/test/secure_fw/suites/fwu/mcuboot/CMakeLists.txt
index 6194cd8..f2d0dfe 100644
--- a/test/secure_fw/suites/fwu/mcuboot/CMakeLists.txt
+++ b/test/secure_fw/suites/fwu/mcuboot/CMakeLists.txt
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2021, Arm Limited. All rights reserved.
+# Copyright (c) 2021-2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -65,7 +65,6 @@
target_link_libraries(tfm_test_suite_fwu_s
PRIVATE
- tfm_secure_api
tfm_test_framework_s
platform_s
)
diff --git a/test/secure_fw/suites/its/CMakeLists.txt b/test/secure_fw/suites/its/CMakeLists.txt
index 810aa78..29b4314 100644
--- a/test/secure_fw/suites/its/CMakeLists.txt
+++ b/test/secure_fw/suites/its/CMakeLists.txt
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2020-2021, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -72,7 +72,7 @@
target_link_libraries(tfm_test_suite_its_s
PRIVATE
- tfm_secure_api
+ tfm_sprt
tfm_test_framework_s
platform_region_defs
tfm_app_rot_partition_secure_client_2
diff --git a/test/secure_fw/suites/platform/CMakeLists.txt b/test/secure_fw/suites/platform/CMakeLists.txt
index 51cd750..90c628f 100644
--- a/test/secure_fw/suites/platform/CMakeLists.txt
+++ b/test/secure_fw/suites/platform/CMakeLists.txt
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2020-2021, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -69,7 +69,6 @@
target_link_libraries(tfm_test_suite_platform_s
PRIVATE
tfm_test_framework_s
- tfm_secure_api
platform_s
)
diff --git a/test/secure_fw/suites/ps/service/CMakeLists.txt b/test/secure_fw/suites/ps/service/CMakeLists.txt
index a74d544..00f0660 100644
--- a/test/secure_fw/suites/ps/service/CMakeLists.txt
+++ b/test/secure_fw/suites/ps/service/CMakeLists.txt
@@ -45,8 +45,7 @@
target_link_libraries(tfm_psa_rot_partition_ps_test
PRIVATE
- tfm_secure_api
- psa_interface
+ tfm_sprt
platform_s
tfm_app_rot_partition_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 2549f6e..7e3101a 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
@@ -43,8 +43,7 @@
target_link_libraries(tfm_app_rot_partition_ipc_client
PRIVATE
- tfm_secure_api
- psa_interface
+ tfm_sprt
platform_s
)
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 eaade9b..76585aa 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
@@ -45,8 +45,6 @@
target_link_libraries(tfm_psa_rot_partition_ipc_service
PRIVATE
- tfm_secure_api
- psa_interface
platform_s
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 569c1a9..37e89b8 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
@@ -33,11 +33,9 @@
target_link_libraries(tfm_app_rot_partition_flih_test
PRIVATE
- 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 3bf2f6a..cb60126 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
@@ -33,11 +33,9 @@
target_link_libraries(tfm_app_rot_partition_slih_test
PRIVATE
- 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 6d991bb..ed98e59 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
@@ -42,8 +42,6 @@
target_link_libraries(tfm_app_rot_partition_sfn_backend_test
PRIVATE
- tfm_secure_api
- psa_interface
platform_s
tfm_sprt
spm_test_service_common