commit d44522ac99d957c5d00853f8aa8040fe963a251e
author Mingyang Sun <mingyang.sun@arm.com> Thu Jan 16 16:48:37 2020 +0800
committer Mingyang Sun <mingyang.sun@arm.com> Wed Apr 22 10:35:49 2020 +0800
tree a2d302341ccc0a061735cf460c9d4132098a5578
parent 56f01bd92521bf28c20fa990ca70e8b2e3c0a548

Core: Move IPC model SPM code to 'spm' folder

- APIs in 'tfm_svcalls.c' are actually part of SPM, so move them
  to 'secure_fw/spm/spm_ipc.c', and rename SPM APIs with 'tfm_spm'
  prefix.
- APIs in 'tfm_psa_client_call.c' are also a part of SPM, move
  the whole file and header file to SPM, and add 'tfm_spm' prefix
  to API names.
- Move API declaration into 'spm_api.h' header.
- Add static declaration to internal-used functions.
- Remove inclusion of some unused header files.

Change-Id: I90ff634987ce9e01ddb3a294b7f1f5f222792f8c
Signed-off-by: Mingyang Sun <mingyang.sun@arm.com>

secure_fw/spm/CMakeLists.inc

diff --git a/secure_fw/spm/CMakeLists.inc b/secure_fw/spm/CMakeLists.inc
index 23d8e83..cb458d5 100644
--- a/secure_fw/spm/CMakeLists.inc
+++ b/secure_fw/spm/CMakeLists.inc
@@ -27,7 +27,8 @@
 set (SS_SPM_C_SRC "${SS_SPM_DIR}/spm_api.c")
 
 if(TFM_PSA_API)
-	list(APPEND SS_SPM_C_SRC "${SS_SPM_DIR}/spm_ipc.c")
+	list(APPEND SS_SPM_C_SRC "${SS_SPM_DIR}/spm_ipc.c"
+		"${SS_SPM_DIR}/spm_psa_client_call.c")
 else()
 	list(APPEND SS_SPM_C_SRC "${SS_SPM_DIR}/spm_func.c")
 endif()
@@ -41,7 +42,6 @@
 embedded_include_directories(PATH ${TFM_ROOT_DIR}/interface/include ABSOLUTE)
 embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/spm ABSOLUTE)
 embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/core/include ABSOLUTE)
-embedded_include_directories(PATH ${TFM_ROOT_DIR} ABSOLUTE)
 
 set(BUILD_CMSIS_CORE Off)
 set(BUILD_RETARGET Off)