SPM: Sort out tfm_secure_api.c file
- Rename 'tfm_utils.h' to 'utilities.h'.
- Rename 'tfm_spm_services_api.h'to 'tfm_spm_services.h'.
- Move 'tfm_secure_api.c' from spm/runtime to spm/model_func and
sort out the content
Change-Id: Ie8831e2b1430eab6a2edc9b6c0487ef14f2fafc6
Signed-off-by: Summer Qin <summer.qin@arm.com>
diff --git a/secure_fw/include/tfm/tfm_spm_services.h b/secure_fw/include/tfm/tfm_spm_services.h
new file mode 100644
index 0000000..43e7e81
--- /dev/null
+++ b/secure_fw/include/tfm/tfm_spm_services.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+
+#ifndef __TFM_SPM_SERVICES_H__
+#define __TFM_SPM_SERVICES_H__
+
+#include "psa/service.h"
+#include "tfm_boot_status.h"
+
+enum tfm_spm_request_type_t {
+ TFM_SPM_REQUEST_RESET_VOTE,
+};
+
+/**
+ * \brief Request a vote from SPM on a system reset
+ *
+ * \return Returns 0 if request is accepted, any other value means reject
+ */
+int32_t tfm_spm_request_reset_vote(void);
+int32_t tfm_core_get_boot_data(uint8_t major_type,
+ struct tfm_boot_data *boot_data,
+ uint32_t len);
+
+void tfm_enable_irq(psa_signal_t irq_signal);
+void tfm_disable_irq(psa_signal_t irq_signal);
+
+#endif /* __TFM_SPM_SERVICES_H__ */
diff --git a/secure_fw/include/tfm/tfm_spm_services_api.h b/secure_fw/include/tfm/tfm_spm_services_api.h
deleted file mode 100644
index be08ed2..0000000
--- a/secure_fw/include/tfm/tfm_spm_services_api.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- */
-
-#ifndef __TFM_SPM_SERVICES_API_H__
-#define __TFM_SPM_SERVICES_API_H__
-
-enum tfm_spm_request_type_t {
- TFM_SPM_REQUEST_RESET_VOTE,
-};
-
-/**
- * \brief Request a vote from SPM on a system reset
- *
- * \return Returns 0 if request is accepted, any other value means reject
- */
-int32_t tfm_spm_request_reset_vote(void);
-
-#endif /* __TFM_SPM_SERVICES_API_H__ */