commit 71a79fe39226d20c936b2004c530a35fa0c7ad63
author Ken Liu <Ken.Liu@arm.com> Wed Mar 01 16:27:23 2023 +0800
committer Ken Liu <ken.liu@arm.com> Thu Mar 02 09:51:27 2023 +0100
tree ef95b5b6699070507967b2e6152bab8c88573792
parent e6a8beb1b9b86944648d93ad367b77f21561dd40

SPM: Gather memory symbols into one single file

For unified referencing and clearly showcasing SPM required
memory symbols. Memory symbols can come from linker sections,
or be defined in sources with toolchain-specific attributes.

Signed-off-by: Ken Liu <Ken.Liu@arm.com>
Change-Id: I920329ad08c9515e370653a9c5d663f3970b7395

secure_fw/spm/ffm/backend_ipc.c

diff --git a/secure_fw/spm/ffm/backend_ipc.c b/secure_fw/spm/ffm/backend_ipc.c
index 94e1bf5..469e7f3 100644
--- a/secure_fw/spm/ffm/backend_ipc.c
+++ b/secure_fw/spm/ffm/backend_ipc.c
@@ -16,12 +16,12 @@
 #include "runtime_defs.h"
 #include "ffm/stack_watermark.h"
 #include "spm.h"
-#include "tfm_hal_memory_symbols.h"
 #include "tfm_hal_isolation.h"
 #include "tfm_hal_platform.h"
 #include "tfm_rpc.h"
 #include "ffm/backend.h"
 #include "utilities.h"
+#include "cmsis_psa/memory_symbols.h"
 #include "load/partition_defs.h"
 #include "load/service_defs.h"
 #include "load/spm_load_api.h"
@@ -271,7 +271,7 @@
     /* Init thread callback function. */
     thrd_set_query_callback(query_state);
 
-    partition_meta_indicator_pos = (uintptr_t *)hal_mem_sp_meta_start;
+    partition_meta_indicator_pos = (uintptr_t *)PART_LOCAL_STORAGE_PTR_POS;
     control = thrd_start_scheduler(&CURRENT_THREAD);
 
     p_cur_pt = TO_CONTAINER(CURRENT_THREAD->p_context_ctrl,