commit 8e6832547da23ac2db4a747a0b0d25ecf4959f40
author David Hu <david.hu@arm.com> Thu Dec 17 18:02:32 2020 +0800
committer David Hu <david.hu@arm.com> Fri Jan 22 10:18:55 2021 +0800
tree 1d32941bb3aa326d9949d7645f10c9f77e18bdd2
parent 48369dbaf8c38cde3dc789d587c66809dd7454e5

Dualcpu: Update NS mailbox file path to align with TF-M changes

TF-M changes the path of NS mailbox files. Update the paths in NS
interface build.

Signed-off-by: David Hu <david.hu@arm.com>
Change-Id: I369b7962b8c00faeb435983c114e288f7a72d30c

app/CMakeLists.txt

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 8822fea..c1ad860 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -33,6 +33,7 @@
         ${INTERFACE_INC_DIR}
         ${CMAKE_BINARY_DIR}/generated/interface/include
         ${INTERFACE_INC_DIR}/os_wrapper
+        $<$<BOOL:${TFM_MULTI_CORE_TOPOLOGY}>:${INTERFACE_INC_DIR}/multi_core>
 )
 
 # PSA interface files are generated from a template
@@ -78,10 +79,10 @@
 
     if (TFM_MULTI_CORE_TOPOLOGY)
         target_sources(tfm_api_ns PRIVATE
-            ${INTERFACE_SRC_DIR}/tfm_ns_mailbox.c
-            ${INTERFACE_SRC_DIR}/tfm_multi_core_ns_api.c
-            ${INTERFACE_SRC_DIR}/tfm_multi_core_psa_ns_api.c
-            ${INTERFACE_SRC_DIR}/tfm_ns_mailbox_rtos_api.c
+            ${INTERFACE_SRC_DIR}/multi_core/tfm_ns_mailbox.c
+            ${INTERFACE_SRC_DIR}/multi_core/tfm_multi_core_ns_api.c
+            ${INTERFACE_SRC_DIR}/multi_core/tfm_multi_core_psa_ns_api.c
+            ${INTERFACE_SRC_DIR}/multi_core/tfm_ns_mailbox_rtos_api.c
         )
     else()
         target_sources(tfm_api_ns PRIVATE