SPM: Move psa client call apis into 'spm/common'
PSA client APIs implementation is pure logic which belongs
to the 'spm/common'.
Change-Id: Ia327971e918d0cc997cdcbcd16f9ca8ce10206a6
Signed-off-by: Summer Qin <summer.qin@arm.com>
diff --git a/secure_fw/spm/cmsis_psa/CMakeLists.inc b/secure_fw/spm/cmsis_psa/CMakeLists.inc
index 637bf5d..ea24393 100644
--- a/secure_fw/spm/cmsis_psa/CMakeLists.inc
+++ b/secure_fw/spm/cmsis_psa/CMakeLists.inc
@@ -34,12 +34,12 @@
set(SFW_SPM_COMMON_DIR "${SFW_SPM_DIR}/common")
set (SFW_IPC_SPM_SRC
+ "${SFW_SPM_COMMON_DIR}/spm_psa_client_call.c"
"${SFW_SPM_COMMON_DIR}/tfm_boot_data.c"
"${SFW_SPM_COMMON_DIR}/tfm_core_utils.c"
"${SFW_SPM_COMMON_DIR}/utilities.c"
"${SFW_IPC_SPM_DIR}/main.c"
"${SFW_IPC_SPM_DIR}/spm_ipc.c"
- "${SFW_IPC_SPM_DIR}/spm_psa_client_call.c"
"${SFW_IPC_SPM_DIR}/tfm_core_svcalls_ipc.c"
"${SFW_IPC_SPM_DIR}/tfm_pools.c"
"${SFW_IPC_SPM_DIR}/tfm_thread.c"
diff --git a/secure_fw/spm/cmsis_psa/spm_ipc.c b/secure_fw/spm/cmsis_psa/spm_ipc.c
index c823812..5abbe24 100644
--- a/secure_fw/spm/cmsis_psa/spm_ipc.c
+++ b/secure_fw/spm/cmsis_psa/spm_ipc.c
@@ -22,7 +22,7 @@
#include "spm_ipc.h"
#include "tfm_peripherals_def.h"
#include "tfm_core_utils.h"
-#include "spm_psa_client_call.h"
+#include "common/spm_psa_client_call.h"
#include "tfm_rpc.h"
#include "tfm_core_trustzone.h"
#include "tfm_core_mem_check.h"
diff --git a/secure_fw/spm/cmsis_psa/tfm_rpc.c b/secure_fw/spm/cmsis_psa/tfm_rpc.c
index 402b055..08b4bd4 100644
--- a/secure_fw/spm/cmsis_psa/tfm_rpc.c
+++ b/secure_fw/spm/cmsis_psa/tfm_rpc.c
@@ -6,7 +6,7 @@
*/
#include "spm_ipc.h"
-#include "spm_psa_client_call.h"
+#include "common/spm_psa_client_call.h"
#include "tfm_rpc.h"
#include "utilities.h"
diff --git a/secure_fw/spm/cmsis_psa/spm_psa_client_call.c b/secure_fw/spm/common/spm_psa_client_call.c
similarity index 99%
rename from secure_fw/spm/cmsis_psa/spm_psa_client_call.c
rename to secure_fw/spm/common/spm_psa_client_call.c
index 4f93746..e06d456 100644
--- a/secure_fw/spm/cmsis_psa/spm_psa_client_call.c
+++ b/secure_fw/spm/common/spm_psa_client_call.c
@@ -10,7 +10,7 @@
#include "tfm_core_utils.h"
#include "tfm_internal_defines.h"
#include "tfm_memory_utils.h"
-#include "spm_psa_client_call.h"
+#include "common/spm_psa_client_call.h"
#include "utilities.h"
#include "tfm_wait.h"
#include "tfm_nspm.h"
diff --git a/secure_fw/spm/cmsis_psa/spm_psa_client_call.h b/secure_fw/spm/common/spm_psa_client_call.h
similarity index 100%
rename from secure_fw/spm/cmsis_psa/spm_psa_client_call.h
rename to secure_fw/spm/common/spm_psa_client_call.h