SPM: Remove IPC model reference of "spm_partition_defs.h"
This header file contains mostly library model related definitions.
Move or copy the IPC related definitions to IPC header files, leave
it for library use.
Change-Id: I3621c43a941481b24a77fc5a240572f25772d86e
Signed-off-by: Mingyang Sun <mingyang.sun@arm.com>
diff --git a/secure_fw/spm/include/load/partition_defs.h b/secure_fw/spm/include/load/partition_defs.h
index 9eb3ea9..449c9db 100644
--- a/secure_fw/spm/include/load/partition_defs.h
+++ b/secure_fw/spm/include/load/partition_defs.h
@@ -11,6 +11,11 @@
#include <stddef.h>
#include <stdint.h>
+/* TF-M internal partition ID */
+#define TFM_SP_NON_SECURE_ID (0)
+#define TFM_SP_IDLE_ID (1)
+#define INVALID_PARTITION_ID (~0U)
+
/* Encode a magic number into version for validating partition info */
#define PARTITION_INFO_VERSION_MASK (0x0000FFFF)
#define PARTITION_INFO_MAGIC_MASK (0xFFFF0000)
diff --git a/secure_fw/spm/include/spm_partition_defs.h b/secure_fw/spm/include/spm_partition_defs.h
index 252f99c..54240f1 100644
--- a/secure_fw/spm/include/spm_partition_defs.h
+++ b/secure_fw/spm/include/spm_partition_defs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -24,14 +24,13 @@
* operations.
*/
#define TFM_SP_NON_SECURE_ID (0)
-#define TFM_SP_IDLE_ID (1)
+
/* A dummy partition for TFM_SP_CORE is created to handle secure partition
* calls done directly from the core, before NS execution started.
*/
#define TFM_SP_CORE_ID (1)
#include "psa_manifest/pid.h"
-#include "psa/service.h"
/* This limit is only used to define the size of the database reserved for
* partitions. There's no requirement that it match the number of partitions
@@ -40,6 +39,5 @@
#define SPM_MAX_PARTITIONS (TFM_MAX_USER_PARTITIONS + TFM_INTERNAL_PARTITIONS)
typedef void(*sp_entry_point)(void);
-typedef psa_flih_result_t (*psa_flih_func)(void);
#endif /* __SPM_PARTITION_DEFS_H__ */