SPM: Remove "spm request" function
Remove the unused "spm request" function.
Move the library-model-only header to its folder.
Change-Id: Iff1daddaa15841903dce51494735c86992b850f0
Signed-off-by: Mingyang Sun <mingyang.sun@arm.com>
diff --git a/secure_fw/spm/include/interface/svc_num.h b/secure_fw/spm/include/interface/svc_num.h
index 7a3c3c5..2b88e16 100644
--- a/secure_fw/spm/include/interface/svc_num.h
+++ b/secure_fw/spm/include/interface/svc_num.h
@@ -39,10 +39,9 @@
#define TFM_SVC_PSA_IRQ_DISABLE (0x12)
#define TFM_SVC_PSA_RESET_SIGNAL (0x13)
/* TF-M specific, starts from 0x40 */
-#define TFM_SVC_SPM_REQUEST (0x40)
-#define TFM_SVC_GET_BOOT_DATA (0x41)
-#define TFM_SVC_SPM_INIT (0x42)
-#define TFM_SVC_FLIH_FUNC_RETURN (0x43)
+#define TFM_SVC_GET_BOOT_DATA (0x40)
+#define TFM_SVC_SPM_INIT (0x41)
+#define TFM_SVC_FLIH_FUNC_RETURN (0x42)
#define TFM_SVC_THREAD_NUMBER_END (0x7F)
#if (TFM_SPM_LOG_LEVEL > TFM_SPM_LOG_LEVEL_SILENCE)
#define TFM_SVC_OUTPUT_UNPRIV_STRING (TFM_SVC_THREAD_NUMBER_END)
diff --git a/secure_fw/spm/include/spm_partition_defs.h b/secure_fw/spm/include/spm_partition_defs.h
deleted file mode 100644
index 54240f1..0000000
--- a/secure_fw/spm/include/spm_partition_defs.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2017-2021, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- */
-
-#ifndef __SPM_PARTITION_DEFS_H__
-#define __SPM_PARTITION_DEFS_H__
-
-/* FixMe: allocations to be settled.
- * 8 bits reserved by TFM for secure partition Id in this prototype
- */
-#define TFM_SP_BASE 256
-
-/* A reserved partition ID that is used for uninitialised data */
-#define INVALID_PARTITION_ID (~0U)
-
-/* ***** partition ID-s internal to the TFM ***** */
-#define TFM_INTERNAL_PARTITIONS (2)
-
-/* From the SPM point of view the non secure processing environment is handled
- * as a special secure partition. This simplifies the context switch
- * operations.
- */
-#define TFM_SP_NON_SECURE_ID (0)
-
-/* 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"
-
-/* 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
- * that get registered in a specific build
- */
-#define SPM_MAX_PARTITIONS (TFM_MAX_USER_PARTITIONS + TFM_INTERNAL_PARTITIONS)
-
-typedef void(*sp_entry_point)(void);
-
-#endif /* __SPM_PARTITION_DEFS_H__ */