Service: Update the include statements
Change the absolute including into relative including
for partition service sources.
Change-Id: I1cc2057e5965046242a9b70e01e937243cacfc7e
Signed-off-by: Mingyang Sun <mingyang.sun@arm.com>
diff --git a/secure_fw/partitions/crypto/crypto_key_derivation.c b/secure_fw/partitions/crypto/crypto_key_derivation.c
index 6778ce9..4bc0b01 100644
--- a/secure_fw/partitions/crypto/crypto_key_derivation.c
+++ b/secure_fw/partitions/crypto/crypto_key_derivation.c
@@ -22,7 +22,7 @@
#include "tfm_crypto_defs.h"
#include "tfm_memory_utils.h"
-#include "platform/include/tfm_plat_crypto_keys.h"
+#include "tfm_plat_crypto_keys.h"
#ifdef TFM_PARTITION_TEST_SST
#include "psa_manifest/pid.h"
diff --git a/secure_fw/partitions/initial_attestation/attestation.h b/secure_fw/partitions/initial_attestation/attestation.h
index a7be321..08cbad4 100644
--- a/secure_fw/partitions/initial_attestation/attestation.h
+++ b/secure_fw/partitions/initial_attestation/attestation.h
@@ -10,7 +10,7 @@
#include "psa/initial_attestation.h"
#include "tfm_client.h"
-#include "bl2/include/tfm_boot_status.h"
+#include "tfm_boot_status.h"
#ifdef __cplusplus
extern "C" {
diff --git a/secure_fw/partitions/initial_attestation/attestation_core.c b/secure_fw/partitions/initial_attestation/attestation_core.c
index 15f4fa6..6b239d3 100644
--- a/secure_fw/partitions/initial_attestation/attestation_core.c
+++ b/secure_fw/partitions/initial_attestation/attestation_core.c
@@ -20,7 +20,7 @@
#include "attest_eat_defines.h"
#include "t_cose_common.h"
#include "tfm_memory_utils.h"
-#include "platform/include/tfm_plat_crypto_keys.h"
+#include "tfm_plat_crypto_keys.h"
#define MAX_BOOT_STATUS 512
diff --git a/secure_fw/partitions/initial_attestation/attestation_key.c b/secure_fw/partitions/initial_attestation/attestation_key.c
index 7e6f1c4..58e690f 100644
--- a/secure_fw/partitions/initial_attestation/attestation_key.c
+++ b/secure_fw/partitions/initial_attestation/attestation_key.c
@@ -10,8 +10,8 @@
#include "attestation.h"
#include <stdint.h>
#include <stddef.h>
-#include "platform/include/tfm_plat_defs.h"
-#include "platform/include/tfm_plat_crypto_keys.h"
+#include "tfm_plat_defs.h"
+#include "tfm_plat_crypto_keys.h"
#include "t_cose_standard_constants.h"
#include "q_useful_buf.h"
#include "qcbor.h"
diff --git a/secure_fw/partitions/initial_attestation/tfm_attestation.c b/secure_fw/partitions/initial_attestation/tfm_attestation.c
index cf28baa..0ac143a 100644
--- a/secure_fw/partitions/initial_attestation/tfm_attestation.c
+++ b/secure_fw/partitions/initial_attestation/tfm_attestation.c
@@ -9,7 +9,7 @@
#include "tfm_secure_api.h"
#include "attestation.h"
#include "psa/initial_attestation.h"
-#include "bl2/include/tfm_boot_status.h"
+#include "tfm_boot_status.h"
#ifdef TFM_PSA_API
extern int32_t g_attest_caller_id;
diff --git a/secure_fw/partitions/platform/platform_sp.c b/secure_fw/partitions/platform/platform_sp.c
index 461432c..4d53267 100644
--- a/secure_fw/partitions/platform/platform_sp.c
+++ b/secure_fw/partitions/platform/platform_sp.c
@@ -7,9 +7,9 @@
#include "platform_sp.h"
-#include "platform/include/tfm_platform_system.h"
-#include "platform/include/tfm_plat_nv_counters.h"
-#include "secure_fw/include/tfm/tfm_spm_services_api.h"
+#include "tfm_platform_system.h"
+#include "tfm_plat_nv_counters.h"
+#include "tfm/tfm_spm_services_api.h"
#include "tfm_secure_api.h"
#include "psa_manifest/pid.h"
diff --git a/secure_fw/partitions/secure_storage/nv_counters/sst_nv_counters.h b/secure_fw/partitions/secure_storage/nv_counters/sst_nv_counters.h
index 324b471..31b9afb 100644
--- a/secure_fw/partitions/secure_storage/nv_counters/sst_nv_counters.h
+++ b/secure_fw/partitions/secure_storage/nv_counters/sst_nv_counters.h
@@ -18,7 +18,7 @@
#include <stdint.h>
#include "psa/protected_storage.h"
-#include "platform/include/tfm_plat_nv_counters.h"
+#include "tfm_plat_nv_counters.h"
#define TFM_SST_NV_COUNTER_1 PLAT_NV_COUNTER_0
#define TFM_SST_NV_COUNTER_2 PLAT_NV_COUNTER_1
diff --git a/test/CMakeLists.inc b/test/CMakeLists.inc
index 4e0c9a4..0b7b327 100644
--- a/test/CMakeLists.inc
+++ b/test/CMakeLists.inc
@@ -32,7 +32,7 @@
endif()
embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/spm ABSOLUTE)
-embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/core/include ABSOLUTE)
+embedded_include_directories(PATH ${TFM_ROOT_DIR}/bl2/include ABSOLUTE)
# Include the test framework
include(${CMAKE_CURRENT_LIST_DIR}/framework/CMakeLists.inc)