commit c1b10903c9219bb79ec9e8a4a6ca0ca486c857fe
author Edison Ai <edison.ai@arm.com> Mon Aug 26 10:34:19 2019 +0800
committer Edison Ai <edison.ai@arm.com> Mon Sep 02 15:37:31 2019 +0800
tree f04b7dc9dfc2b6d9c37bf206c8135019346b4389
parent 651fbb89064cadf8983bfb45d6ff2f146a94900c

Core: Remove unnecessary functions

- Do not call tfm_spm_hal_setup_isolation_hw() if TFM_LVL != 1.
- Do not call tfm_nspm_configure_clients() in IPC model.

Change-Id: I55cfcbd3954fd44d501ed2e992bc2c16d7926726
Signed-off-by: Edison Ai <edison.ai@arm.com>

secure_fw/spm/spm_api.c

diff --git a/secure_fw/spm/spm_api.c b/secure_fw/spm/spm_api.c
index 46d2ca1..b8af146 100644
--- a/secure_fw/spm/spm_api.c
+++ b/secure_fw/spm/spm_api.c
@@ -60,7 +60,7 @@
      */
 
     /* For the non secure Execution environment */
-#if TFM_PSA_API
+#ifdef TFM_PSA_API
     extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Base[];
     extern uint32_t Image$$ARM_LIB_STACK$$ZI$$Limit[];
     uint32_t psp_stack_bottom = (uint32_t)Image$$ARM_LIB_STACK$$ZI$$Base;
@@ -79,7 +79,7 @@
     part_ptr->static_data.partition_flags = 0;
 #endif
 
-#if TFM_PSA_API
+#ifdef TFM_PSA_API
     part_ptr->memory_data.stack_bottom = psp_stack_bottom;
     part_ptr->memory_data.stack_top    = psp_stack_top;
     /* Since RW, ZI and stack are configured as one MPU region, configure
@@ -91,11 +91,9 @@
 #ifndef TFM_PSA_API
     part_ptr->runtime_data.partition_state = SPM_PARTITION_STATE_UNINIT;
     part_ptr->runtime_data.ctx_stack_ptr = ns_interrupt_ctx_stack;
-#endif /* !defined(TFM_PSA_API) */
 
     tfm_nspm_configure_clients();
 
-#ifndef TFM_PSA_API
     /* For the TF-M core environment itself */
     part_ptr = &(g_spm_partition_db.partitions[
                                            TFM_CORE_INTERNAL_PARTITION_DB_IDX]);