Core: Move SVC header into 'secure_fw/include'
The SVC header 'tfm_svc.h' is an interface between secure-services and
the core, not a private header of core. Move it out of 'core/include'
and put it under 'secure_fw/include/core' with a new name
'tfm_core_svc.h' to indicate it is a core interface.
Change-Id: I98a48d417be9e7a590d263b20a9c8b0a5e954f3e
Signed-off-by: Ken Liu <ken.liu@arm.com>
diff --git a/secure_fw/core/arch/CMakeLists.inc b/secure_fw/core/arch/CMakeLists.inc
index 71c7d48..d7c540b 100644
--- a/secure_fw/core/arch/CMakeLists.inc
+++ b/secure_fw/core/arch/CMakeLists.inc
@@ -54,4 +54,5 @@
embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/core ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/core/ipc ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/core/ipc/include ABSOLUTE)
+embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/include ABSOLUTE)
embedded_include_directories(PATH ${TFM_ARCH_DIR}/include ABSOLUTE)
\ No newline at end of file
diff --git a/secure_fw/core/arch/tfm_arch_v8m_base.c b/secure_fw/core/arch/tfm_arch_v8m_base.c
index 39ab57f..764955f 100644
--- a/secure_fw/core/arch/tfm_arch_v8m_base.c
+++ b/secure_fw/core/arch/tfm_arch_v8m_base.c
@@ -11,7 +11,7 @@
#include "tfm_arch.h"
#include "tfm_secure_api.h"
#include "spm_api.h"
-#include "tfm_svc.h"
+#include "core/tfm_core_svc.h"
#if !defined(__ARM_ARCH_8M_BASE__)
#error "Unsupported ARM Architecture."
diff --git a/secure_fw/core/arch/tfm_arch_v8m_main.c b/secure_fw/core/arch/tfm_arch_v8m_main.c
index b917cf5..f717d6c 100644
--- a/secure_fw/core/arch/tfm_arch_v8m_main.c
+++ b/secure_fw/core/arch/tfm_arch_v8m_main.c
@@ -14,7 +14,7 @@
#include "tfm_core_utils.h"
#include "tfm_secure_api.h"
#include "spm_api.h"
-#include "tfm_svc.h"
+#include "core/tfm_core_svc.h"
#if !defined(__ARM_ARCH_8M_MAIN__)
#error "Unsupported ARM Architecture."
diff --git a/secure_fw/core/include/secure_utilities.h b/secure_fw/core/include/secure_utilities.h
index 219a475..de08fca 100644
--- a/secure_fw/core/include/secure_utilities.h
+++ b/secure_fw/core/include/secure_utilities.h
@@ -9,8 +9,8 @@
#define __SECURE_UTILITIES_H__
#include <stdbool.h>
+#include "tfm_hal_device_header.h"
#include "cmsis_compiler.h"
-#include "tfm_svc.h"
#include "tfm_core_log.h"
#define EXC_NUM_THREAD_MODE (0)
diff --git a/secure_fw/core/include/tfm_core.h b/secure_fw/core/include/tfm_core.h
index 3eadc1b..8f1c663 100644
--- a/secure_fw/core/include/tfm_core.h
+++ b/secure_fw/core/include/tfm_core.h
@@ -9,7 +9,6 @@
#define __TFM_CORE_H__
#include <arm_cmse.h>
-#include "tfm_svc.h"
#include "secure_utilities.h"
#endif /* __TFM_CORE_H__ */
diff --git a/secure_fw/core/include/tfm_secure_api.h b/secure_fw/core/include/tfm_secure_api.h
index 62a90f1..acfc439 100644
--- a/secure_fw/core/include/tfm_secure_api.h
+++ b/secure_fw/core/include/tfm_secure_api.h
@@ -12,7 +12,7 @@
#include <arm_cmse.h>
#endif
#include "tfm_arch.h"
-#include "tfm_svc.h"
+#include "core/tfm_core_svc.h"
#include "tfm_core.h"
#include "tfm_api.h"
#include "tfm_utils.h"
diff --git a/secure_fw/core/ipc/CMakeLists.inc b/secure_fw/core/ipc/CMakeLists.inc
index 0902d4c..863d50e 100644
--- a/secure_fw/core/ipc/CMakeLists.inc
+++ b/secure_fw/core/ipc/CMakeLists.inc
@@ -73,6 +73,7 @@
embedded_include_directories(PATH ${TFM_ROOT_DIR}/platform/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/include ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/core/ipc ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/core/ipc/include ABSOLUTE)
embedded_include_directories(PATH ${TFM_ROOT_DIR}/secure_fw/core/arch/include ABSOLUTE)
diff --git a/secure_fw/core/ipc/psa_client.c b/secure_fw/core/ipc/psa_client.c
index 6a696e3..8273979 100644
--- a/secure_fw/core/ipc/psa_client.c
+++ b/secure_fw/core/ipc/psa_client.c
@@ -6,8 +6,7 @@
*/
#include <inttypes.h>
-#include <stdio.h>
-#include "tfm_svc.h"
+#include "core/tfm_core_svc.h"
#include "psa/client.h"
__attribute__((naked, section("SFN")))
diff --git a/secure_fw/core/ipc/psa_service.c b/secure_fw/core/ipc/psa_service.c
index 13eb973..45ca53d 100644
--- a/secure_fw/core/ipc/psa_service.c
+++ b/secure_fw/core/ipc/psa_service.c
@@ -7,7 +7,7 @@
#include <inttypes.h>
#include <stdio.h>
-#include "tfm_svc.h"
+#include "core/tfm_core_svc.h"
#include "psa/client.h"
#include "psa/service.h"
diff --git a/secure_fw/core/ipc/tfm_svcalls.c b/secure_fw/core/ipc/tfm_svcalls.c
index b086767..e09d6e3 100644
--- a/secure_fw/core/ipc/tfm_svcalls.c
+++ b/secure_fw/core/ipc/tfm_svcalls.c
@@ -7,9 +7,9 @@
#include <inttypes.h>
#include <stdbool.h>
#include <stdlib.h>
+#include "core/tfm_core_svc.h"
#include "psa/client.h"
#include "psa/service.h"
-#include "tfm_svc.h"
#include "tfm_svcalls.h"
#include "tfm_thread.h"
#include "tfm_wait.h"
diff --git a/secure_fw/core/ipc/tfm_thread.c b/secure_fw/core/ipc/tfm_thread.c
index 70d4d20..65aa018 100644
--- a/secure_fw/core/ipc/tfm_thread.c
+++ b/secure_fw/core/ipc/tfm_thread.c
@@ -9,7 +9,7 @@
#include "tfm_thread.h"
#include "tfm_utils.h"
#include "tfm_memory_utils.h"
-#include "tfm_svc.h"
+#include "core/tfm_core_svc.h"
#include "spm_api.h"
#include "tfm_core_utils.h"
diff --git a/secure_fw/core/tfm_core_svcalls_func.c b/secure_fw/core/tfm_core_svcalls_func.c
index 6d2e750..3332508 100644
--- a/secure_fw/core/tfm_core_svcalls_func.c
+++ b/secure_fw/core/tfm_core_svcalls_func.c
@@ -8,7 +8,7 @@
#include <string.h>
#include "secure_utilities.h"
-#include "tfm_svc.h"
+#include "core/tfm_core_svc.h"
#include "tfm_secure_api.h"
#include "region_defs.h"
#include "spm_partition_defs.h"
diff --git a/secure_fw/core/tfm_core_svcalls_ipc.c b/secure_fw/core/tfm_core_svcalls_ipc.c
index 159f609..8bd6111 100644
--- a/secure_fw/core/tfm_core_svcalls_ipc.c
+++ b/secure_fw/core/tfm_core_svcalls_ipc.c
@@ -8,7 +8,7 @@
#include <string.h>
#include "tfm_api.h"
#include "tfm_internal.h"
-#include "tfm_svc.h"
+#include "core/tfm_core_svc.h"
#include "tfm_utils.h"
#include "tfm_svcalls.h"
diff --git a/secure_fw/core/tfm_spm_services.c b/secure_fw/core/tfm_spm_services.c
index d7b119d..127a9e3 100644
--- a/secure_fw/core/tfm_spm_services.c
+++ b/secure_fw/core/tfm_spm_services.c
@@ -7,7 +7,7 @@
#include <arm_cmse.h>
-#include "tfm_svc.h"
+#include "core/tfm_core_svc.h"
#include "tfm_secure_api.h"
#include "tfm_internal.h"
#include "secure_fw/include/tfm_spm_services_api.h"
diff --git a/secure_fw/core/include/tfm_svc.h b/secure_fw/include/core/tfm_core_svc.h
similarity index 91%
rename from secure_fw/core/include/tfm_svc.h
rename to secure_fw/include/core/tfm_core_svc.h
index 945a745..a96b7f7 100644
--- a/secure_fw/core/include/tfm_svc.h
+++ b/secure_fw/include/core/tfm_core_svc.h
@@ -5,8 +5,8 @@
*
*/
-#ifndef __TFM_SVC_H__
-#define __TFM_SVC_H__
+#ifndef __TFM_CORE_SVC_H__
+#define __TFM_CORE_SVC_H__
#include "tfm_hal_device_header.h"
@@ -48,4 +48,4 @@
#define SVC(code) __ASM volatile("svc %0" : : "I" (code))
-#endif /* __TFM_SVC_H__ */
+#endif /* __TFM_CORE_SVC_H__ */