SPM: Adjust psa_arch_test SPE libraries name
Adjust psa_arch_test SPE libraries name to tfm_psa_rot_partition_* or
tfm_app_rot_partition_* to make sure their data put in right place.
Change-Id: Ia4443807cc87170405dbc158d86d24b55d66b774
Signed-off-by: Shawn Shan <Shawn.Shan@arm.com>
diff --git a/lib/ext/psa_arch_tests/0001-Align-SPE-libraries-name-with-TF-M.patch b/lib/ext/psa_arch_tests/0001-Align-SPE-libraries-name-with-TF-M.patch
new file mode 100644
index 0000000..53880cf
--- /dev/null
+++ b/lib/ext/psa_arch_tests/0001-Align-SPE-libraries-name-with-TF-M.patch
@@ -0,0 +1,31 @@
+From a74762e09a3f0407b10d1494f2b55b034fce70bb Mon Sep 17 00:00:00 2001
+From: Shawn Shan <Shawn.Shan@arm.com>
+Date: Wed, 10 Mar 2021 17:00:30 +0800
+Subject: [PATCH] Align SPE libraries name with TF-M
+
+Change-Id: I3d0030cea15ce5d3e283d766a50d0d43b83eab7b
+Signed-off-by: Shawn Shan <Shawn.Shan@arm.com>
+---
+ api-tests/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/api-tests/CMakeLists.txt b/api-tests/CMakeLists.txt
+index c243ebd..e63a7c3 100644
+--- a/api-tests/CMakeLists.txt
++++ b/api-tests/CMakeLists.txt
+@@ -177,9 +177,9 @@ endif()
+ set(PSA_TARGET_PAL_NSPE_LIB pal_nspe)
+ set(PSA_TARGET_VAL_NSPE_LIB val_nspe)
+ set(PSA_TARGET_TEST_COMBINE_LIB test_combine)
+-set(PSA_TARGET_DRIVER_PARTITION_LIB driver_partition)
+-set(PSA_TARGET_CLIENT_PARTITION_LIB client_partition)
+-set(PSA_TARGET_SERVER_PARTITION_LIB server_partition)
++set(PSA_TARGET_DRIVER_PARTITION_LIB tfm_psa_rot_partition_driver_partition)
++set(PSA_TARGET_CLIENT_PARTITION_LIB tfm_app_rot_partition_client_partition)
++set(PSA_TARGET_SERVER_PARTITION_LIB tfm_app_rot_partition_server_partition)
+ if(${SUITE} STREQUAL "IPC")
+ set(PSA_SUITE_DIR ${PSA_ROOT_DIR}/ff/${SUITE_LOWER})
+ set(PSA_SUITE_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/ff/${SUITE_LOWER})
+--
+2.17.1
+
diff --git a/secure_fw/spm/CMakeLists.txt b/secure_fw/spm/CMakeLists.txt
index dd7c054..655d57b 100755
--- a/secure_fw/spm/CMakeLists.txt
+++ b/secure_fw/spm/CMakeLists.txt
@@ -66,11 +66,11 @@
#workaround for arch-test
if (TEST_PSA_API STREQUAL IPC)
- target_sources(driver_partition PRIVATE
+ target_sources(tfm_psa_rot_partition_driver_partition PRIVATE
${CMAKE_BINARY_DIR}/generated/api-tests/platform/manifests/auto_generated/intermedia_driver_partition_psa.c)
- target_sources(client_partition PRIVATE
+ target_sources(tfm_app_rot_partition_client_partition PRIVATE
${CMAKE_BINARY_DIR}/generated/api-tests/platform/manifests/auto_generated/intermedia_client_partition_psa.c)
- target_sources(server_partition PRIVATE
+ target_sources(tfm_app_rot_partition_server_partition PRIVATE
${CMAKE_BINARY_DIR}/generated/api-tests/platform/manifests/auto_generated/intermedia_server_partition_psa.c)
endif()
@@ -83,9 +83,9 @@
tfm_boot_status
tfm_secure_api
tfm_partitions
- $<$<STREQUAL:${TEST_PSA_API},IPC>:driver_partition>
- $<$<STREQUAL:${TEST_PSA_API},IPC>:client_partition>
- $<$<STREQUAL:${TEST_PSA_API},IPC>:server_partition>
+ $<$<STREQUAL:${TEST_PSA_API},IPC>:tfm_psa_rot_partition_driver_partition>
+ $<$<STREQUAL:${TEST_PSA_API},IPC>:tfm_app_rot_partition_client_partition>
+ $<$<STREQUAL:${TEST_PSA_API},IPC>:tfm_app_rot_partition_server_partition>
)
target_compile_definitions(tfm_spm