commit b8ed8ba16edeb28361fde1a2a4b6b03164aa9c0d
author Ken Liu <ken.liu@arm.com> Tue Jul 09 12:52:08 2019 +0800
committer Ken Liu (Arm Technology China) <ken.liu@arm.com> Mon Aug 19 02:35:28 2019 +0100
tree 4a94776c665582cbdf6540c0e702d67e13353c9c
parent 711a5d31d5fa13508b492af289921c65f8206b14

Core: Move headers into 'core/include'

Move core headers into dedicated header folder to show more readibility
and easy include. Modules who needs to include header could add this
'include' folder into their project/make file.

Change-Id: I48ddaabd46d6331a10cb630911116d43a2213f8f
Signed-off-by: Ken Liu <ken.liu@arm.com>

secure_fw/spm/CMakeLists.inc

diff --git a/secure_fw/spm/CMakeLists.inc b/secure_fw/spm/CMakeLists.inc
index e7c30e3..c7f2954 100644
--- a/secure_fw/spm/CMakeLists.inc
+++ b/secure_fw/spm/CMakeLists.inc
@@ -40,7 +40,7 @@
 embedded_include_directories(PATH ${TFM_ROOT_DIR} ABSOLUTE)
 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 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)

secure_fw/spm/spm_api.c

diff --git a/secure_fw/spm/spm_api.c b/secure_fw/spm/spm_api.c
index 2aabaef2..8cfad13 100644
--- a/secure_fw/spm/spm_api.c
+++ b/secure_fw/spm/spm_api.c
@@ -16,7 +16,7 @@
 #include "tfm_internal.h"
 #include "tfm_api.h"
 #include "tfm_nspm.h"
-#include "secure_fw/core/tfm_core.h"
+#include "secure_fw/core/include/tfm_core.h"
 #include "tfm_peripherals_def.h"
 #include "spm_partition_defs.h"
 

secure_fw/spm/spm_api.h

diff --git a/secure_fw/spm/spm_api.h b/secure_fw/spm/spm_api.h
index 9097fba..70d9cac 100644
--- a/secure_fw/spm/spm_api.h
+++ b/secure_fw/spm/spm_api.h
@@ -11,7 +11,7 @@
 /* This file contains the apis exported by the SPM to tfm core */
 #include "tfm_api.h"
 #include "spm_partition_defs.h"
-#include "secure_fw/core/tfm_secure_api.h"
+#include "secure_fw/core/include/tfm_secure_api.h"
 #include <stdbool.h>
 #ifdef TFM_PSA_API
 #include "tfm_list.h"