commit 0eb7c919ffc8389e21fe778016eb8619c155469a
author Summer Qin <summer.qin@arm.com> Wed Aug 19 16:08:50 2020 +0800
committer Ken Liu <ken.liu@arm.com> Thu Aug 27 03:27:59 2020 +0000
tree f34e9a6468fd800cdb3e46a5fd34d9ef5fd20d91
parent bce211309283a5422a4dfc4ebe5550f16eedc0ca

HAL: Rename platform init function

Align with HAL design document:
 - Rename 'tfm_spm_hal_post_init' to 'tfm_hal_platform_init'.
 - Set 'tfm_hal_platform_init' to weak, and platform with specific init
   operation needs to override it.
 - Remove 'tfm_spm_hal_post_init_platform' and move the operations to
   'tfm_hal_platform_init'.

Change-Id: Ia96b3a6bae716d154edab8709eb6e277bafcb45e
Signed-off-by: Summer Qin <summer.qin@arm.com>

secure_fw/spm/cmsis_func/main.c

diff --git a/secure_fw/spm/cmsis_func/main.c b/secure_fw/spm/cmsis_func/main.c
index 0d6a23b..e070515 100644
--- a/secure_fw/spm/cmsis_func/main.c
+++ b/secure_fw/spm/cmsis_func/main.c
@@ -8,6 +8,7 @@
 #include "log/tfm_log.h"
 #include "region.h"
 #include "spm_func.h"
+#include "tfm_hal_platform.h"
 #include "tfm_internal.h"
 #include "tfm_irq_list.h"
 #include "tfm_nspm.h"
@@ -33,6 +34,7 @@
 static int32_t tfm_core_init(void)
 {
     size_t i;
+    enum tfm_hal_status_t hal_status = TFM_HAL_ERROR_GENERIC;
     enum tfm_plat_err_t plat_err = TFM_PLAT_ERR_SYSTEM_ERR;
     enum irq_target_state_t irq_target_state = TFM_IRQ_TARGET_STATE_SECURE;
 
@@ -64,8 +66,8 @@
     }
 
     /* Performs platform specific initialization */
-    plat_err = tfm_spm_hal_post_init();
-    if (plat_err != TFM_PLAT_ERR_SUCCESS) {
+    hal_status = tfm_hal_platform_init();
+    if (hal_status != TFM_HAL_SUCCESS) {
         return TFM_ERROR_GENERIC;
     }