Core: Change the signature of entry point
According to PSA FF, the signature of entry point should be
"void entry_point(void)"
Change-Id: Id5b5be8012da3ce9753db2e48818fd79467bb425
Signed-off-by: Edison Ai <edison.ai@arm.com>
diff --git a/secure_fw/spm/spm_db.h b/secure_fw/spm/spm_db.h
index 14e5074..3c3aa95 100644
--- a/secure_fw/spm/spm_db.h
+++ b/secure_fw/spm/spm_db.h
@@ -11,7 +11,7 @@
struct spm_partition_desc_t;
struct spm_partition_db_t;
-typedef psa_status_t(*sp_init_function)(void);
+typedef void(*sp_entry_point)(void);
#define TFM_PARTITION_TYPE_APP "APPLICATION-ROT"
#define TFM_PARTITION_TYPE_PSA "PSA-ROT"
@@ -40,7 +40,7 @@
uint32_t partition_id;
uint32_t partition_flags;
uint32_t partition_priority;
- sp_init_function partition_init;
+ sp_entry_point partition_init;
};
/**
diff --git a/secure_fw/spm/tfm_spm_db.inc b/secure_fw/spm/tfm_spm_db.inc
index ec59c51..2ac6176 100644
--- a/secure_fw/spm/tfm_spm_db.inc
+++ b/secure_fw/spm/tfm_spm_db.inc
@@ -59,47 +59,47 @@
/** Declarations of partition init functions */
/**************************************************************************/
#ifdef TFM_PSA_API
-extern psa_status_t tfm_nspm_thread_entry(void);
+extern void tfm_nspm_thread_entry(void);
#endif
-extern int32_t tfm_sst_req_mngr_init(void);
+extern void tfm_sst_req_mngr_init(void);
-extern int32_t tfm_its_req_mngr_init(void);
+extern void tfm_its_req_mngr_init(void);
#ifdef TFM_PARTITION_AUDIT_LOG
-extern int32_t audit_core_init(void);
+extern void audit_core_init(void);
#endif /* TFM_PARTITION_AUDIT_LOG */
-extern int32_t tfm_crypto_init(void);
+extern void tfm_crypto_init(void);
#ifdef TFM_PARTITION_PLATFORM
-extern int32_t platform_sp_init(void);
+extern void platform_sp_init(void);
#endif /* TFM_PARTITION_PLATFORM */
-extern int32_t attest_partition_init(void);
+extern void attest_partition_init(void);
#ifdef TFM_PARTITION_TEST_CORE
-extern int32_t core_test_init(void);
+extern void core_test_init(void);
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_CORE
-extern int32_t core_test_2_init(void);
+extern void core_test_2_init(void);
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
-extern int32_t tfm_secure_client_service_init(void);
+extern void tfm_secure_client_service_init(void);
#endif /* TFM_PARTITION_TEST_SECURE_SERVICES */
#ifdef TFM_PARTITION_TEST_CORE_IPC
-extern int32_t ipc_service_test_main(void);
+extern void ipc_service_test_main(void);
#endif /* TFM_PARTITION_TEST_CORE_IPC */
#ifdef TFM_PARTITION_TEST_CORE_IPC
-extern int32_t ipc_client_test_main(void);
+extern void ipc_client_test_main(void);
#endif /* TFM_PARTITION_TEST_CORE_IPC */
#ifdef TFM_ENABLE_IRQ_TEST
-extern int32_t tfm_irq_test_1_init(void);
+extern void tfm_irq_test_1_init(void);
#endif /* TFM_ENABLE_IRQ_TEST */
/**************************************************************************/
diff --git a/secure_fw/spm/tfm_spm_db.inc.template b/secure_fw/spm/tfm_spm_db.inc.template
index b69fbe9..5e12dd0 100644
--- a/secure_fw/spm/tfm_spm_db.inc.template
+++ b/secure_fw/spm/tfm_spm_db.inc.template
@@ -33,14 +33,14 @@
/** Declarations of partition init functions */
/**************************************************************************/
#ifdef TFM_PSA_API
-extern psa_status_t tfm_nspm_thread_entry(void);
+extern void tfm_nspm_thread_entry(void);
#endif
{% for manifest in manifests %}
{% if manifest.attr.conditional %}
#ifdef {{manifest.attr.conditional}}
{% endif %}
-extern int32_t {{manifest.manifest.entry_point}}(void);
+extern void {{manifest.manifest.entry_point}}(void);
{% if manifest.attr.conditional %}
#endif /* {{manifest.attr.conditional}} */
{% endif %}