SPM: Rename spm_ipc.h to spm.h
This file is also used in SFN backend.
Signed-off-by: Sherry Zhang <sherry.zhang2@arm.com>
Change-Id: I4818edfbca3b84414db4ac5d7d8293f0e0c41276
diff --git a/secure_fw/spm/cmsis_psa/arch/tfm_arch_v6m_v7m.c b/secure_fw/spm/cmsis_psa/arch/tfm_arch_v6m_v7m.c
index abda72f..b88d656 100644
--- a/secure_fw/spm/cmsis_psa/arch/tfm_arch_v6m_v7m.c
+++ b/secure_fw/spm/cmsis_psa/arch/tfm_arch_v6m_v7m.c
@@ -9,7 +9,7 @@
#include "compiler_ext_defs.h"
#include "security_defs.h"
#include "utilities.h"
-#include "spm_ipc.h"
+#include "spm.h"
#include "tfm_arch.h"
#include "tfm_hal_device_header.h"
#include "tfm_svcalls.h"
diff --git a/secure_fw/spm/cmsis_psa/arch/tfm_arch_v8m_base.c b/secure_fw/spm/cmsis_psa/arch/tfm_arch_v8m_base.c
index a4f8916..0ba8baa 100644
--- a/secure_fw/spm/cmsis_psa/arch/tfm_arch_v8m_base.c
+++ b/secure_fw/spm/cmsis_psa/arch/tfm_arch_v8m_base.c
@@ -11,7 +11,7 @@
#include <inttypes.h>
#include "compiler_ext_defs.h"
#include "security_defs.h"
-#include "spm_ipc.h"
+#include "spm.h"
#include "svc_num.h"
#include "tfm_hal_device_header.h"
#include "tfm_arch.h"
diff --git a/secure_fw/spm/cmsis_psa/arch/tfm_arch_v8m_main.c b/secure_fw/spm/cmsis_psa/arch/tfm_arch_v8m_main.c
index d6d24c6..562056f 100644
--- a/secure_fw/spm/cmsis_psa/arch/tfm_arch_v8m_main.c
+++ b/secure_fw/spm/cmsis_psa/arch/tfm_arch_v8m_main.c
@@ -13,7 +13,7 @@
#include "compiler_ext_defs.h"
#include "security_defs.h"
#include "region_defs.h"
-#include "spm_ipc.h"
+#include "spm.h"
#include "svc_num.h"
#include "tfm_arch.h"
#include "tfm_hal_device_header.h"
diff --git a/secure_fw/spm/cmsis_psa/main.c b/secure_fw/spm/cmsis_psa/main.c
index 0a674b0..27e91f8 100644
--- a/secure_fw/spm/cmsis_psa/main.c
+++ b/secure_fw/spm/cmsis_psa/main.c
@@ -9,7 +9,7 @@
#include "fih.h"
#include "ffm/tfm_boot_data.h"
#include "region.h"
-#include "spm_ipc.h"
+#include "spm.h"
#include "tfm_hal_isolation.h"
#include "tfm_hal_platform.h"
#include "tfm_api.h"
diff --git a/secure_fw/spm/cmsis_psa/psa_interface_cross.c b/secure_fw/spm/cmsis_psa/psa_interface_cross.c
index 5697f90..5638acb 100644
--- a/secure_fw/spm/cmsis_psa/psa_interface_cross.c
+++ b/secure_fw/spm/cmsis_psa/psa_interface_cross.c
@@ -9,7 +9,7 @@
#include "compiler_ext_defs.h"
#include "config_spm.h"
#include "ffm/psa_api.h"
-#include "spm_ipc.h"
+#include "spm.h"
#include "svc_num.h"
#include "tfm_psa_call_pack.h"
#include "psa/client.h"
diff --git a/secure_fw/spm/cmsis_psa/spm_ipc.h b/secure_fw/spm/cmsis_psa/spm.h
similarity index 99%
rename from secure_fw/spm/cmsis_psa/spm_ipc.h
rename to secure_fw/spm/cmsis_psa/spm.h
index 4e63a66..ce30249 100644
--- a/secure_fw/spm/cmsis_psa/spm_ipc.h
+++ b/secure_fw/spm/cmsis_psa/spm.h
@@ -8,8 +8,8 @@
*
*/
-#ifndef __SPM_IPC_H__
-#define __SPM_IPC_H__
+#ifndef __SPM_H__
+#define __SPM_H__
#include <stdint.h>
#include "config_impl.h"
@@ -377,4 +377,4 @@
#endif
-#endif /* __SPM_IPC_H__ */
+#endif /* __SPM_H__ */
diff --git a/secure_fw/spm/cmsis_psa/spm_cross_call.c b/secure_fw/spm/cmsis_psa/spm_cross_call.c
index 80838b8..4e4aa40 100644
--- a/secure_fw/spm/cmsis_psa/spm_cross_call.c
+++ b/secure_fw/spm/cmsis_psa/spm_cross_call.c
@@ -9,7 +9,7 @@
#include "config_impl.h"
#include "compiler_ext_defs.h"
#include "current.h"
-#include "spm_ipc.h"
+#include "spm.h"
#include "tfm_arch.h"
#include "ffm/backend.h"
#include "ffm/psa_api.h"
diff --git a/secure_fw/spm/cmsis_psa/spm_ipc.c b/secure_fw/spm/cmsis_psa/spm_ipc.c
index 7a52792..7bae3da 100755
--- a/secure_fw/spm/cmsis_psa/spm_ipc.c
+++ b/secure_fw/spm/cmsis_psa/spm_ipc.c
@@ -26,7 +26,7 @@
#include "tfm_hal_defs.h"
#include "tfm_hal_interrupt.h"
#include "tfm_hal_isolation.h"
-#include "spm_ipc.h"
+#include "spm.h"
#include "tfm_peripherals_def.h"
#include "tfm_nspm.h"
#include "tfm_rpc.h"
diff --git a/secure_fw/spm/cmsis_psa/static_loader.c b/secure_fw/spm/cmsis_psa/static_loader.c
index d981d9b..c7724cf 100644
--- a/secure_fw/spm/cmsis_psa/static_loader.c
+++ b/secure_fw/spm/cmsis_psa/static_loader.c
@@ -13,7 +13,7 @@
#include "lists.h"
#include "region.h"
#include "region_defs.h"
-#include "spm_ipc.h"
+#include "spm.h"
#include "tfm_hal_interrupt.h"
#include "tfm_plat_defs.h"
#include "utilities.h"
diff --git a/secure_fw/spm/cmsis_psa/tfm_core_svcalls_ipc.c b/secure_fw/spm/cmsis_psa/tfm_core_svcalls_ipc.c
index cb4d946..5f9ce65 100644
--- a/secure_fw/spm/cmsis_psa/tfm_core_svcalls_ipc.c
+++ b/secure_fw/spm/cmsis_psa/tfm_core_svcalls_ipc.c
@@ -8,7 +8,7 @@
#include <string.h>
#include "config_spm.h"
#include "region.h"
-#include "spm_ipc.h"
+#include "spm.h"
#include "svc_num.h"
#include "tfm_api.h"
#include "tfm_arch.h"
diff --git a/secure_fw/spm/cmsis_psa/tfm_rpc.c b/secure_fw/spm/cmsis_psa/tfm_rpc.c
index ad096c9..6e601c8 100644
--- a/secure_fw/spm/cmsis_psa/tfm_rpc.c
+++ b/secure_fw/spm/cmsis_psa/tfm_rpc.c
@@ -5,7 +5,7 @@
*
*/
-#include "spm_ipc.h"
+#include "spm.h"
#include "ffm/psa_api.h"
#include "tfm_rpc.h"
#include "utilities.h"
diff --git a/secure_fw/spm/cmsis_psa/tfm_rpc.h b/secure_fw/spm/cmsis_psa/tfm_rpc.h
index f047572..1a25f6f 100644
--- a/secure_fw/spm/cmsis_psa/tfm_rpc.h
+++ b/secure_fw/spm/cmsis_psa/tfm_rpc.h
@@ -23,7 +23,7 @@
#include "psa/client.h"
#include "psa/service.h"
#include "thread.h"
-#include "spm_ipc.h"
+#include "spm.h"
#define TFM_RPC_SUCCESS (0)
#define TFM_RPC_INVAL_PARAM (INT32_MIN + 1)
diff --git a/secure_fw/spm/ffm/backend_ipc.c b/secure_fw/spm/ffm/backend_ipc.c
index 673b980..b712b5c 100644
--- a/secure_fw/spm/ffm/backend_ipc.c
+++ b/secure_fw/spm/ffm/backend_ipc.c
@@ -15,7 +15,7 @@
#include "config_spm.h"
#include "runtime_defs.h"
#include "ffm/stack_watermark.h"
-#include "spm_ipc.h"
+#include "spm.h"
#include "tfm_hal_memory_symbols.h"
#include "tfm_hal_isolation.h"
#include "tfm_hal_platform.h"
diff --git a/secure_fw/spm/ffm/backend_sfn.c b/secure_fw/spm/ffm/backend_sfn.c
index 336fec1..bdc74d3 100644
--- a/secure_fw/spm/ffm/backend_sfn.c
+++ b/secure_fw/spm/ffm/backend_sfn.c
@@ -20,7 +20,7 @@
#include "load/spm_load_api.h"
#include "psa/error.h"
#include "psa/service.h"
-#include "spm_ipc.h"
+#include "spm.h"
/* SFN Partition state */
#define SFN_PARTITION_STATE_NOT_INITED 0
diff --git a/secure_fw/spm/ffm/interrupt.h b/secure_fw/spm/ffm/interrupt.h
index ef3b434..9034cf8 100644
--- a/secure_fw/spm/ffm/interrupt.h
+++ b/secure_fw/spm/ffm/interrupt.h
@@ -8,7 +8,7 @@
*
*/
-#include "spm_ipc.h"
+#include "spm.h"
#include "load/interrupt_defs.h"
#include "load/partition_defs.h"
diff --git a/secure_fw/spm/ffm/psa_api.c b/secure_fw/spm/ffm/psa_api.c
index 4ad63a4..35561fb 100644
--- a/secure_fw/spm/ffm/psa_api.c
+++ b/secure_fw/spm/ffm/psa_api.c
@@ -16,7 +16,7 @@
#include "psa/lifecycle.h"
#include "psa/service.h"
#include "interrupt.h"
-#include "spm_ipc.h"
+#include "spm.h"
#include "tfm_arch.h"
#include "load/partition_defs.h"
#include "load/service_defs.h"
diff --git a/secure_fw/spm/ffm/stack_watermark.c b/secure_fw/spm/ffm/stack_watermark.c
index cfcfa97..75acfa1 100644
--- a/secure_fw/spm/ffm/stack_watermark.c
+++ b/secure_fw/spm/ffm/stack_watermark.c
@@ -10,7 +10,7 @@
#include "ffm/stack_watermark.h"
#include "lists.h"
#include "load/spm_load_api.h"
-#include "spm_ipc.h"
+#include "spm.h"
#include "tfm_spm_log.h"
/* Always output, regardless of log level.
diff --git a/secure_fw/spm/ffm/stack_watermark.h b/secure_fw/spm/ffm/stack_watermark.h
index 1af1094..64b2153 100644
--- a/secure_fw/spm/ffm/stack_watermark.h
+++ b/secure_fw/spm/ffm/stack_watermark.h
@@ -8,7 +8,7 @@
#ifndef __STACK_WATERMARK_H__
#define __STACK_WATERMARK_H__
-#include "spm_ipc.h"
+#include "spm.h"
#ifdef CONFIG_TFM_STACK_WATERMARKS
void watermark_stack(struct partition_t *p_pt);
diff --git a/secure_fw/spm/ffm/tfm_boot_data.c b/secure_fw/spm/ffm/tfm_boot_data.c
index 1a0186b..3979c6a 100644
--- a/secure_fw/spm/ffm/tfm_boot_data.c
+++ b/secure_fw/spm/ffm/tfm_boot_data.c
@@ -16,7 +16,7 @@
#include "utilities.h"
#include "psa/service.h"
#include "thread.h"
-#include "spm_ipc.h"
+#include "spm.h"
#include "load/partition_defs.h"
#include "tfm_hal_isolation.h"
diff --git a/secure_fw/spm/include/current.h b/secure_fw/spm/include/current.h
index 63a25bd..e3c953d 100644
--- a/secure_fw/spm/include/current.h
+++ b/secure_fw/spm/include/current.h
@@ -8,7 +8,7 @@
#define __CURRENT_H__
#include "thread.h"
-#include "spm_ipc.h"
+#include "spm.h"
#if CONFIG_TFM_SPM_BACKEND_SFN != 1
/* Get current component */
diff --git a/secure_fw/spm/include/ffm/backend.h b/secure_fw/spm/include/ffm/backend.h
index a743718..9d167c1 100644
--- a/secure_fw/spm/include/ffm/backend.h
+++ b/secure_fw/spm/include/ffm/backend.h
@@ -9,7 +9,7 @@
#define __BACKEND_H__
#include <stdint.h>
-#include "spm_ipc.h"
+#include "spm.h"
#include "tfm_arch.h"
#include "load/spm_load_api.h"
#include "psa/error.h"
diff --git a/secure_fw/spm/include/load/spm_load_api.h b/secure_fw/spm/include/load/spm_load_api.h
index 16f9af9..9fce498 100644
--- a/secure_fw/spm/include/load/spm_load_api.h
+++ b/secure_fw/spm/include/load/spm_load_api.h
@@ -16,7 +16,7 @@
#include "interrupt_defs.h"
#include "partition_defs.h"
#include "service_defs.h"
-#include "spm_ipc.h"
+#include "spm.h"
/* No more partition to be loaded */
#define NO_MORE_PARTITION NULL