Core: shorten the include path of header files under secure_fw/core/include
Directly include header files under secure_fw/core/include instead
of including the whole relative paths.
It can save maintenance cost when code structure changes.
Change-Id: I3a54915b988368ca736a008056bdeb7eaa94990a
Signed-off-by: David Hu <david.hu@arm.com>
diff --git a/secure_fw/services/crypto/CMakeLists.inc b/secure_fw/services/crypto/CMakeLists.inc
index 5f68827..9c98e6a 100644
--- a/secure_fw/services/crypto/CMakeLists.inc
+++ b/secure_fw/services/crypto/CMakeLists.inc
@@ -60,6 +60,7 @@
#Setting include directories
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/core/include ABSOLUTE)
if (CRYPTO_ENGINE_MBEDTLS)
embedded_include_directories(PATH ${MBEDTLS_INSTALL_DIR}/include ABSOLUTE)
endif()
diff --git a/secure_fw/services/crypto/crypto_alloc.c b/secure_fw/services/crypto/crypto_alloc.c
index cfe493c..df322ab 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/include/tfm_memory_utils.h"
+#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 317a7f2..de28a4a 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/include/tfm_memory_utils.h"
+#include "tfm_memory_utils.h"
/**
* \brief Table containing all the Uniform Signature API exposed
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 1a698eb..d82863e 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/include/tfm_memory_utils.h"
+#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 6647522..961ee5a 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/include/tfm_memory_utils.h"
+#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 c5bd838..15ddc9d 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,9 +10,9 @@
#include <stddef.h>
#include "cmsis_compiler.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"
+#include "tfm_memory_utils.h"
#if ((SST_TOTAL_NUM_OF_BLOCKS < 2) || (SST_TOTAL_NUM_OF_BLOCKS == 3))
/* The minimum number of blocks is 2. In this case, metadata and data are
diff --git a/secure_fw/services/secure_storage/sst_encrypted_object.c b/secure_fw/services/secure_storage/sst_encrypted_object.c
index 1aff992..1578753 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/include/tfm_memory_utils.h"
+#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 07e04e8..6441a5b 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/include/tfm_memory_utils.h"
+#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 9dbc644..dd325bf 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/include/tfm_memory_utils.h"
+#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 69f6ff2..2dae8ec 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/include/tfm_secure_api.h"
+#include "tfm_secure_api.h"
#include "tfm_api.h"
#include "tfm_protected_storage.h"
#ifdef TFM_PSA_API
diff --git a/secure_fw/spm/spm_api.c b/secure_fw/spm/spm_api.c
index 8cfad13..46d2ca1 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/include/tfm_core.h"
+#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 70d9cac..3edd8a8 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/include/tfm_secure_api.h"
+#include "tfm_secure_api.h"
#include <stdbool.h>
#ifdef TFM_PSA_API
#include "tfm_list.h"
diff --git a/test/suites/crypto/CMakeLists.inc b/test/suites/crypto/CMakeLists.inc
index cf09a13..1e2fa0e 100644
--- a/test/suites/crypto/CMakeLists.inc
+++ b/test/suites/crypto/CMakeLists.inc
@@ -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
#
@@ -35,5 +35,6 @@
#Setting include directories
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/core/include ABSOLUTE)
endif()
diff --git a/test/suites/crypto/crypto_tests_common.c b/test/suites/crypto/crypto_tests_common.c
index 991fc2f..5ee65ce 100644
--- a/test/suites/crypto/crypto_tests_common.c
+++ b/test/suites/crypto/crypto_tests_common.c
@@ -8,7 +8,7 @@
#if DOMAIN_NS == 1
#include <string.h>
#else
-#include "secure_fw/core/include/tfm_memory_utils.h"
+#include "tfm_memory_utils.h"
#endif
#include "crypto_tests_common.h"
diff --git a/test/suites/sst/CMakeLists.inc b/test/suites/sst/CMakeLists.inc
index 5dee18f..54c8edf 100644
--- a/test/suites/sst/CMakeLists.inc
+++ b/test/suites/sst/CMakeLists.inc
@@ -57,4 +57,5 @@
embedded_include_directories(PATH ${TFM_ROOT_DIR} ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/test/interface/include ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/interface/include ABSOLUTE)
+ embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/core/include ABSOLUTE)
endif()
diff --git a/test/suites/sst/secure/psa_ps_s_interface_testsuite.c b/test/suites/sst/secure/psa_ps_s_interface_testsuite.c
index 0bcfb34..cc49e7a 100644
--- a/test/suites/sst/secure/psa_ps_s_interface_testsuite.c
+++ b/test/suites/sst/secure/psa_ps_s_interface_testsuite.c
@@ -10,7 +10,7 @@
#include <stdio.h>
#include "s_test_helpers.h"
-#include "secure_fw/core/include/tfm_memory_utils.h"
+#include "tfm_memory_utils.h"
#include "psa/protected_storage.h"
#include "test/framework/test_framework_helpers.h"
diff --git a/test/suites/sst/secure/psa_ps_s_reliability_testsuite.c b/test/suites/sst/secure/psa_ps_s_reliability_testsuite.c
index 7455d33..417a02f 100644
--- a/test/suites/sst/secure/psa_ps_s_reliability_testsuite.c
+++ b/test/suites/sst/secure/psa_ps_s_reliability_testsuite.c
@@ -10,7 +10,7 @@
#include <stdio.h>
#include "psa/protected_storage.h"
-#include "secure_fw/core/include/tfm_memory_utils.h"
+#include "tfm_memory_utils.h"
#include "s_test_helpers.h"
#include "test/framework/test_framework_helpers.h"
diff --git a/test/suites/sst/secure/sst_rollback_protection_testsuite.c b/test/suites/sst/secure/sst_rollback_protection_testsuite.c
index f9b5bc6..3194b91 100644
--- a/test/suites/sst/secure/sst_rollback_protection_testsuite.c
+++ b/test/suites/sst/secure/sst_rollback_protection_testsuite.c
@@ -12,7 +12,7 @@
#include "secure_fw/services/secure_storage/nv_counters/sst_nv_counters.h"
#include "nv_counters/test_sst_nv_counters.h"
#include "psa/protected_storage.h"
-#include "secure_fw/core/include/tfm_memory_utils.h"
+#include "tfm_memory_utils.h"
#include "s_test_helpers.h"
/* This include is required to expose the sst_system_prepare function to
diff --git a/test/test_services/CMakeLists.inc b/test/test_services/CMakeLists.inc
index 40d60d4..8d4e256 100644
--- a/test/test_services/CMakeLists.inc
+++ b/test/test_services/CMakeLists.inc
@@ -66,6 +66,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}/platform/include ABSOLUTE)
+embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/core/include ABSOLUTE)
set(BUILD_CMSIS_CORE Off)
set(BUILD_RETARGET Off)
diff --git a/test/test_services/tfm_core_test/core_test_defs.h b/test/test_services/tfm_core_test/core_test_defs.h
index 45cd0dd..f7600d9 100644
--- a/test/test_services/tfm_core_test/core_test_defs.h
+++ b/test/test_services/tfm_core_test/core_test_defs.h
@@ -15,7 +15,7 @@
#include <inttypes.h>
#include <limits.h>
#include "tfm_api.h"
-#include "secure_fw/core/include/tfm_core.h"
+#include "tfm_core.h"
/* These definitions are used in symbols, only digits are permitted */
#define CORE_TEST_ID_NS_THREAD 1001
diff --git a/test/test_services/tfm_core_test/tfm_ss_core_test.c b/test/test_services/tfm_core_test/tfm_ss_core_test.c
index acba637..a7b7ade 100644
--- a/test/test_services/tfm_core_test/tfm_ss_core_test.c
+++ b/test/test_services/tfm_core_test/tfm_ss_core_test.c
@@ -10,8 +10,8 @@
#include "tfm_api.h"
#include "test/test_services/tfm_core_test/core_test_defs.h"
#include "tfm_veneers.h"
-#include "secure_fw/core/include/secure_utilities.h"
-#include "secure_fw/core/include/tfm_secure_api.h"
+#include "secure_utilities.h"
+#include "tfm_secure_api.h"
#include "secure_fw/include/tfm_spm_services_api.h"
#include "spm_partition_defs.h"
#include "psa/service.h"
diff --git a/test/test_services/tfm_ipc_service/tfm_ipc_service_test.c b/test/test_services/tfm_ipc_service/tfm_ipc_service_test.c
index 4913a23..903d9de 100644
--- a/test/test_services/tfm_ipc_service/tfm_ipc_service_test.c
+++ b/test/test_services/tfm_ipc_service/tfm_ipc_service_test.c
@@ -10,8 +10,8 @@
#include <stdbool.h>
#include "psa/client.h"
#include "psa/service.h"
-#include "secure_fw/core/include/secure_utilities.h"
-#include "secure_fw/core/include/tfm_secure_api.h"
+#include "secure_utilities.h"
+#include "tfm_secure_api.h"
#include "tfm_api.h"
#include "psa_manifest/tfm_ipc_service_partition.h"
diff --git a/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c b/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c
index 84e2e99..28c11a7 100644
--- a/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c
+++ b/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c
@@ -8,8 +8,8 @@
#include <stddef.h>
#include "tfm_api.h"
#include "tfm_veneers.h"
-#include "secure_fw/core/include/secure_utilities.h"
-#include "secure_fw/core/include/tfm_secure_api.h"
+#include "secure_utilities.h"
+#include "tfm_secure_api.h"
#include "secure_fw/include/tfm_spm_services_api.h"
#include "spm_partition_defs.h"
#include "test/test_services/tfm_core_test/core_test_defs.h"
diff --git a/test/test_services/tfm_secure_client_service/tfm_secure_client_service_veneers.c b/test/test_services/tfm_secure_client_service/tfm_secure_client_service_veneers.c
index bcfde46..21e388c 100644
--- a/test/test_services/tfm_secure_client_service/tfm_secure_client_service_veneers.c
+++ b/test/test_services/tfm_secure_client_service/tfm_secure_client_service_veneers.c
@@ -8,7 +8,7 @@
#include "tfm_secure_client_service_veneers.h"
#include "tfm_secure_client_service.h"
-#include "secure_fw/core/include/tfm_secure_api.h"
+#include "tfm_secure_api.h"
#include "secure_fw/spm/spm_partition_defs.h"
__tfm_secure_gateway_attributes__