commit c3123ecc732c90de37042f59b5ce11f1bae7cbae
author Mingyang Sun <mingyang.sun@arm.com> Thu Jun 11 17:43:58 2020 +0800
committer Mingyang Sun <mingyang.sun@arm.com> Fri Jun 19 10:17:49 2020 +0800
tree 7a459202d04ff4706541d4653d0f4a5d4b52d8db
parent bd7ceb57864baf27bbcce02ed709f57a3bc825f7

Core: Move spm header files to 'spm' folder

- Move 'spm_xxx.h' to 'spm' folder, they should belong to 'spm'.
- Fix and simplify inclusion of header file.
- Fix format and typo error.

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

secure_fw/spm/runtime/spm_api.c

diff --git a/secure_fw/spm/runtime/spm_api.c b/secure_fw/spm/runtime/spm_api.c
index 5ff1dc3..22db2ec 100644
--- a/secure_fw/spm/runtime/spm_api.c
+++ b/secure_fw/spm/runtime/spm_api.c
@@ -7,8 +7,8 @@
 
 /* All the APIs defined in this file are common for library and IPC model. */
 
-#include "tfm/spm_api.h"
-#include "tfm/spm_db.h"
+#include "spm_api.h"
+#include "spm_db.h"
 
 /* Extern SPM variable */
 extern struct spm_partition_db_t g_spm_partition_db;

secure_fw/spm/runtime/tfm_core_mem_check.c

diff --git a/secure_fw/spm/runtime/tfm_core_mem_check.c b/secure_fw/spm/runtime/tfm_core_mem_check.c
index 17ab074..d0983cb 100644
--- a/secure_fw/spm/runtime/tfm_core_mem_check.c
+++ b/secure_fw/spm/runtime/tfm_core_mem_check.c
@@ -7,7 +7,7 @@
 
 #include <arm_cmse.h>
 #include "region_defs.h"
-#include "tfm/spm_api.h"
+#include "spm_api.h"
 #include "tfm_api.h"
 
 /**

secure_fw/spm/runtime/tfm_spm_services.c

diff --git a/secure_fw/spm/runtime/tfm_spm_services.c b/secure_fw/spm/runtime/tfm_spm_services.c
index fc3f038..25c6514 100644
--- a/secure_fw/spm/runtime/tfm_spm_services.c
+++ b/secure_fw/spm/runtime/tfm_spm_services.c
@@ -11,7 +11,7 @@
 #include "tfm_secure_api.h"
 #include "tfm_internal.h"
 #include "tfm/tfm_spm_services_api.h"
-#include "tfm/spm_api.h"
+#include "spm_api.h"
 #include "psa/service.h"
 
 #ifndef TFM_PSA_API