aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMingyang Sun <mingyang.sun@arm.com>2020-06-04 17:18:16 +0800
committerMingyang Sun <mingyang.sun@arm.com>2020-06-08 11:18:54 +0800
commit67a1c0e7ed8a01246b3032b4c53ad5058f93f3e9 (patch)
treef6669a26161ac63fbcfe8203c84e99a8bfba7bd0
parent8a19e7af618ad9de8e1ddd60ba38d85319cd61e3 (diff)
downloadtrusted-firmware-m-67a1c0e7ed8a01246b3032b4c53ad5058f93f3e9.tar.gz
Core: Update the include statement
Change the absolute including into relative including for core sources. Change-Id: Ic5b47c149a3739ad5e79af8231e48dfc68074369 Signed-off-by: Mingyang Sun <mingyang.sun@arm.com>
-rw-r--r--secure_fw/spm/include/tfm_secure_api.h2
-rw-r--r--secure_fw/spm/init/tfm_boot_data.c2
-rw-r--r--secure_fw/spm/model_func/CMakeLists.inc1
-rw-r--r--secure_fw/spm/model_func/tfm_nspm_func.c2
-rw-r--r--secure_fw/spm/model_ipc/CMakeLists.inc1
-rw-r--r--secure_fw/spm/model_ipc/tfm_multi_core.c2
-rw-r--r--secure_fw/spm/model_ipc/tfm_multi_core_mem_check.c2
-rw-r--r--secure_fw/spm/model_ipc/tfm_nspm_ipc.c2
-rw-r--r--secure_fw/spm/runtime/tfm_spm_services.c2
9 files changed, 9 insertions, 7 deletions
diff --git a/secure_fw/spm/include/tfm_secure_api.h b/secure_fw/spm/include/tfm_secure_api.h
index 2112ce9031..818f55c0d6 100644
--- a/secure_fw/spm/include/tfm_secure_api.h
+++ b/secure_fw/spm/include/tfm_secure_api.h
@@ -16,7 +16,7 @@
#include "tfm_core.h"
#include "tfm_api.h"
#include "tfm_utils.h"
-#include "bl2/include/tfm_boot_status.h"
+#include "tfm_boot_status.h"
#include "psa/service.h"
#ifndef TFM_MULTI_CORE_TOPOLOGY
diff --git a/secure_fw/spm/init/tfm_boot_data.c b/secure_fw/spm/init/tfm_boot_data.c
index 2dfbbc4cc7..d8e021ced5 100644
--- a/secure_fw/spm/init/tfm_boot_data.c
+++ b/secure_fw/spm/init/tfm_boot_data.c
@@ -6,7 +6,7 @@
*/
#include <stdint.h>
-#include "bl2/include/tfm_boot_status.h"
+#include "tfm_boot_status.h"
#include "region_defs.h"
#include "tfm_memory_utils.h"
#include "tfm_internal.h"
diff --git a/secure_fw/spm/model_func/CMakeLists.inc b/secure_fw/spm/model_func/CMakeLists.inc
index 154417c08c..e700a9fd09 100644
--- a/secure_fw/spm/model_func/CMakeLists.inc
+++ b/secure_fw/spm/model_func/CMakeLists.inc
@@ -58,3 +58,4 @@ embedded_include_directories(PATH ${TFM_ROOT_DIR}/interface/include ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/include ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/spm/include ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/spm/arch/include ABSOLUTE)
+embedded_include_directories(PATH ${TFM_ROOT_DIR}/bl2/include ABSOLUTE)
diff --git a/secure_fw/spm/model_func/tfm_nspm_func.c b/secure_fw/spm/model_func/tfm_nspm_func.c
index 83bcce6773..820736527f 100644
--- a/secure_fw/spm/model_func/tfm_nspm_func.c
+++ b/secure_fw/spm/model_func/tfm_nspm_func.c
@@ -7,7 +7,7 @@
#include <stdbool.h>
#include "cmsis_compiler.h"
-#include "platform/include/tfm_spm_hal.h"
+#include "tfm_spm_hal.h"
#include "tfm_arch.h"
#include "tfm_api.h"
#include "tfm_internal.h"
diff --git a/secure_fw/spm/model_ipc/CMakeLists.inc b/secure_fw/spm/model_ipc/CMakeLists.inc
index a95fd99622..a763ab46ea 100644
--- a/secure_fw/spm/model_ipc/CMakeLists.inc
+++ b/secure_fw/spm/model_ipc/CMakeLists.inc
@@ -74,3 +74,4 @@ embedded_include_directories(PATH ${TFM_ROOT_DIR}/interface/include ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/include ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/spm/include ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/spm/arch/include ABSOLUTE)
+embedded_include_directories(PATH ${TFM_ROOT_DIR}/bl2/include ABSOLUTE)
diff --git a/secure_fw/spm/model_ipc/tfm_multi_core.c b/secure_fw/spm/model_ipc/tfm_multi_core.c
index 0678509bb7..855755b96c 100644
--- a/secure_fw/spm/model_ipc/tfm_multi_core.c
+++ b/secure_fw/spm/model_ipc/tfm_multi_core.c
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#include "platform/include/tfm_spm_hal.h"
+#include "tfm_spm_hal.h"
#include "psa/client.h"
#include "tfm_internal.h"
#include "tfm_nspm.h"
diff --git a/secure_fw/spm/model_ipc/tfm_multi_core_mem_check.c b/secure_fw/spm/model_ipc/tfm_multi_core_mem_check.c
index ccd93d28a6..25a8632da0 100644
--- a/secure_fw/spm/model_ipc/tfm_multi_core_mem_check.c
+++ b/secure_fw/spm/model_ipc/tfm_multi_core_mem_check.c
@@ -6,7 +6,7 @@
#include <stdbool.h>
-#include "platform/include/tfm_spm_hal.h"
+#include "tfm_spm_hal.h"
#include "region_defs.h"
#include "secure_utilities.h"
#include "tfm/spm_api.h"
diff --git a/secure_fw/spm/model_ipc/tfm_nspm_ipc.c b/secure_fw/spm/model_ipc/tfm_nspm_ipc.c
index c5eb993511..8413d46da2 100644
--- a/secure_fw/spm/model_ipc/tfm_nspm_ipc.c
+++ b/secure_fw/spm/model_ipc/tfm_nspm_ipc.c
@@ -6,7 +6,7 @@
*/
#include <stdbool.h>
-#include "platform/include/tfm_spm_hal.h"
+#include "tfm_spm_hal.h"
#include "psa/error.h"
#include "tfm_nspm.h"
#include "tfm_utils.h"
diff --git a/secure_fw/spm/runtime/tfm_spm_services.c b/secure_fw/spm/runtime/tfm_spm_services.c
index 2a04c6e4bc..fc3f0383ae 100644
--- a/secure_fw/spm/runtime/tfm_spm_services.c
+++ b/secure_fw/spm/runtime/tfm_spm_services.c
@@ -10,7 +10,7 @@
#include "tfm/tfm_core_svc.h"
#include "tfm_secure_api.h"
#include "tfm_internal.h"
-#include "secure_fw/include/tfm/tfm_spm_services_api.h"
+#include "tfm/tfm_spm_services_api.h"
#include "tfm/spm_api.h"
#include "psa/service.h"