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>
diff --git a/secure_fw/core/CMakeLists.inc b/secure_fw/core/CMakeLists.inc
index 8603ab8..63099b5 100644
--- a/secure_fw/core/CMakeLists.inc
+++ b/secure_fw/core/CMakeLists.inc
@@ -50,7 +50,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}/secure_fw/core/arch/include ABSOLUTE)
set(BUILD_CMSIS_CORE Off)
diff --git a/secure_fw/core/secure_utilities.h b/secure_fw/core/include/secure_utilities.h
similarity index 100%
rename from secure_fw/core/secure_utilities.h
rename to secure_fw/core/include/secure_utilities.h
diff --git a/secure_fw/core/tfm_core.h b/secure_fw/core/include/tfm_core.h
similarity index 100%
rename from secure_fw/core/tfm_core.h
rename to secure_fw/core/include/tfm_core.h
diff --git a/secure_fw/core/tfm_internal.h b/secure_fw/core/include/tfm_internal.h
similarity index 100%
rename from secure_fw/core/tfm_internal.h
rename to secure_fw/core/include/tfm_internal.h
diff --git a/secure_fw/core/tfm_irq_list.h b/secure_fw/core/include/tfm_irq_list.h
similarity index 100%
rename from secure_fw/core/tfm_irq_list.h
rename to secure_fw/core/include/tfm_irq_list.h
diff --git a/secure_fw/core/tfm_memory_utils.h b/secure_fw/core/include/tfm_memory_utils.h
similarity index 100%
rename from secure_fw/core/tfm_memory_utils.h
rename to secure_fw/core/include/tfm_memory_utils.h
diff --git a/secure_fw/core/tfm_nspm.h b/secure_fw/core/include/tfm_nspm.h
similarity index 100%
rename from secure_fw/core/tfm_nspm.h
rename to secure_fw/core/include/tfm_nspm.h
diff --git a/secure_fw/core/tfm_platform_core_api.h b/secure_fw/core/include/tfm_platform_core_api.h
similarity index 92%
rename from secure_fw/core/tfm_platform_core_api.h
rename to secure_fw/core/include/tfm_platform_core_api.h
index 7092e0c..3532752 100644
--- a/secure_fw/core/tfm_platform_core_api.h
+++ b/secure_fw/core/include/tfm_platform_core_api.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
diff --git a/secure_fw/core/tfm_secure_api.h b/secure_fw/core/include/tfm_secure_api.h
similarity index 100%
rename from secure_fw/core/tfm_secure_api.h
rename to secure_fw/core/include/tfm_secure_api.h
diff --git a/secure_fw/core/tfm_svc.h b/secure_fw/core/include/tfm_svc.h
similarity index 100%
rename from secure_fw/core/tfm_svc.h
rename to secure_fw/core/include/tfm_svc.h
diff --git a/secure_fw/core/tfm_utils.h b/secure_fw/core/include/tfm_utils.h
similarity index 100%
rename from secure_fw/core/tfm_utils.h
rename to secure_fw/core/include/tfm_utils.h
diff --git a/secure_fw/services/audit_logging/CMakeLists.inc b/secure_fw/services/audit_logging/CMakeLists.inc
index 215ea46..108ad2c 100644
--- a/secure_fw/services/audit_logging/CMakeLists.inc
+++ b/secure_fw/services/audit_logging/CMakeLists.inc
@@ -37,5 +37,5 @@
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}/platform/ext/common ABSOLUTE)
diff --git a/secure_fw/services/crypto/crypto_alloc.c b/secure_fw/services/crypto/crypto_alloc.c
index 685ea0a..cfe493c 100644
--- a/secure_fw/services/crypto/crypto_alloc.c
+++ b/secure_fw/services/crypto/crypto_alloc.c
@@ -12,7 +12,7 @@
#include "tfm_crypto_api.h"
#include "tfm_crypto_defs.h"
-#include "secure_fw/core/tfm_memory_utils.h"
+#include "secure_fw/core/include/tfm_memory_utils.h"
/**
* \def TFM_CRYPTO_CONC_OPER_NUM
diff --git a/secure_fw/services/crypto/crypto_init.c b/secure_fw/services/crypto/crypto_init.c
index 0ab89c5..317a7f2 100644
--- a/secure_fw/services/crypto/crypto_init.c
+++ b/secure_fw/services/crypto/crypto_init.c
@@ -23,7 +23,7 @@
#ifdef TFM_PSA_API
#include "psa/service.h"
#include "psa_manifest/tfm_crypto.h"
-#include "secure_fw/core/tfm_memory_utils.h"
+#include "secure_fw/core/include/tfm_memory_utils.h"
/**
* \brief Table containing all the Uniform Signature API exposed
diff --git a/secure_fw/services/initial_attestation/CMakeLists.inc b/secure_fw/services/initial_attestation/CMakeLists.inc
index 4c00ef3..5a9c07f 100644
--- a/secure_fw/services/initial_attestation/CMakeLists.inc
+++ b/secure_fw/services/initial_attestation/CMakeLists.inc
@@ -47,7 +47,7 @@
embedded_include_directories(PATH ${TFM_ROOT_DIR}/platform/ext/common ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/platform/include ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/bl2/include 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}/secure_fw/spm ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/lib/ext/qcbor/inc ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/lib/t_cose/inc ABSOLUTE)
diff --git a/secure_fw/services/platform/platform_sp.c b/secure_fw/services/platform/platform_sp.c
index 13aed6a..5c2d8b4 100644
--- a/secure_fw/services/platform/platform_sp.c
+++ b/secure_fw/services/platform/platform_sp.c
@@ -8,7 +8,6 @@
#include "platform_sp.h"
#include "platform/include/tfm_platform_system.h"
-#include "secure_fw/core/tfm_secure_api.h"
#include "secure_fw/include/tfm_spm_services_api.h"
enum tfm_platform_err_t platform_sp_init(void)
diff --git a/secure_fw/services/secure_storage/CMakeLists.inc b/secure_fw/services/secure_storage/CMakeLists.inc
index ce1456f..2c3a997 100644
--- a/secure_fw/services/secure_storage/CMakeLists.inc
+++ b/secure_fw/services/secure_storage/CMakeLists.inc
@@ -115,7 +115,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}/platform/ext/common ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/platform/ext/driver ABSOLUTE)
set(BUILD_CMSIS_CORE Off)
diff --git a/secure_fw/services/secure_storage/crypto/sst_crypto_interface.c b/secure_fw/services/secure_storage/crypto/sst_crypto_interface.c
index de9d9d4..1a698eb 100644
--- a/secure_fw/services/secure_storage/crypto/sst_crypto_interface.c
+++ b/secure_fw/services/secure_storage/crypto/sst_crypto_interface.c
@@ -11,7 +11,7 @@
#include "platform/include/tfm_plat_crypto_keys.h"
#include "psa/crypto.h"
-#include "secure_fw/core/tfm_memory_utils.h"
+#include "secure_fw/core/include/tfm_memory_utils.h"
/* FIXME: HUK management should be part of Crypto service, with keys hidden from
* SST.
diff --git a/secure_fw/services/secure_storage/flash/sst_flash.c b/secure_fw/services/secure_storage/flash/sst_flash.c
index 3cbc881..6647522 100644
--- a/secure_fw/services/secure_storage/flash/sst_flash.c
+++ b/secure_fw/services/secure_storage/flash/sst_flash.c
@@ -10,7 +10,7 @@
#include <string.h>
#include "cmsis_compiler.h"
#include "Driver_Flash.h"
-#include "secure_fw/core/tfm_memory_utils.h"
+#include "secure_fw/core/include/tfm_memory_utils.h"
#include "tfm_sst_defs.h"
#ifndef SST_FLASH_AREA_ADDR
diff --git a/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_mblock.c b/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_mblock.c
index dffd157..c5bd838 100644
--- a/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_mblock.c
+++ b/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_mblock.c
@@ -10,7 +10,7 @@
#include <stddef.h>
#include "cmsis_compiler.h"
-#include "secure_fw/core/tfm_memory_utils.h"
+#include "secure_fw/core/include/tfm_memory_utils.h"
#include "secure_fw/services/secure_storage/sst_object_defs.h"
#include "secure_fw/services/secure_storage/sst_utils.h"
diff --git a/secure_fw/services/secure_storage/sst_encrypted_object.c b/secure_fw/services/secure_storage/sst_encrypted_object.c
index ad18b50..1aff992 100644
--- a/secure_fw/services/secure_storage/sst_encrypted_object.c
+++ b/secure_fw/services/secure_storage/sst_encrypted_object.c
@@ -11,7 +11,7 @@
#include "crypto/sst_crypto_interface.h"
#include "flash_fs/sst_flash_fs.h"
-#include "secure_fw/core/tfm_memory_utils.h"
+#include "secure_fw/core/include/tfm_memory_utils.h"
#include "sst_object_defs.h"
#include "sst_utils.h"
diff --git a/secure_fw/services/secure_storage/sst_object_system.c b/secure_fw/services/secure_storage/sst_object_system.c
index ef0213e..07e04e8 100644
--- a/secure_fw/services/secure_storage/sst_object_system.c
+++ b/secure_fw/services/secure_storage/sst_object_system.c
@@ -11,7 +11,7 @@
#include "cmsis_compiler.h"
#include "flash_fs/sst_flash_fs.h"
-#include "secure_fw/core/tfm_memory_utils.h"
+#include "secure_fw/core/include/tfm_memory_utils.h"
#ifdef SST_ENCRYPTION
#include "sst_encrypted_object.h"
#endif
diff --git a/secure_fw/services/secure_storage/sst_object_table.c b/secure_fw/services/secure_storage/sst_object_table.c
index d210250..9dbc644 100644
--- a/secure_fw/services/secure_storage/sst_object_table.c
+++ b/secure_fw/services/secure_storage/sst_object_table.c
@@ -14,7 +14,7 @@
#include "flash/sst_flash.h"
#include "flash_fs/sst_flash_fs.h"
#include "nv_counters/sst_nv_counters.h"
-#include "secure_fw/core/tfm_memory_utils.h"
+#include "secure_fw/core/include/tfm_memory_utils.h"
#include "sst_utils.h"
#include "tfm_sst_defs.h"
diff --git a/secure_fw/services/secure_storage/tfm_sst_req_mngr.c b/secure_fw/services/secure_storage/tfm_sst_req_mngr.c
index 0f7d49b..69f6ff2 100644
--- a/secure_fw/services/secure_storage/tfm_sst_req_mngr.c
+++ b/secure_fw/services/secure_storage/tfm_sst_req_mngr.c
@@ -11,7 +11,7 @@
#include <stdint.h>
#include "psa/protected_storage.h"
-#include "secure_fw/core/tfm_secure_api.h"
+#include "secure_fw/core/include/tfm_secure_api.h"
#include "tfm_api.h"
#include "tfm_protected_storage.h"
#ifdef TFM_PSA_API
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)
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"
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"