commit 402a298e2eb32dc1c72d991eacf300bc96e78416
author David Hu <david.hu@arm.com> Thu Dec 17 22:31:04 2020 +0800
committer David Hu <david.hu@arm.com> Fri Jan 22 10:19:07 2021 +0800
tree fb0229761a17960c02cbf007b99b8bf297434581
parent 8e6832547da23ac2db4a747a0b0d25ecf4959f40

Dualcpu: Update NS mailbox config flags setting

Update NS mailbox config flags setting to align with TF-M change.
- Add TFM_MULTI_CORE_NS_OS flag
- Remove TFM_MULTI_CORE_MULTI_CLIENT_CALL

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

Dualcpu: Add TFM_MULTI_CORE_NS_OS to align with TF-M

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

app/CMakeLists.txt

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index c1ad860..a98f856 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -15,6 +15,9 @@
 if (TFM_MULTI_CORE_TOPOLOGY)
     include(${CMAKE_SOURCE_DIR}/platform/ext/target/${TFM_PLATFORM}/preload_ns.cmake)
     tfm_toolchain_reload_compiler()
+
+    # Enable TFM_MULTI_CORE_NS_OS when building with tf-m-tests NS App.
+    set(TFM_MULTI_CORE_NS_OS ON CACHE BOOL "Enable NS RTOS support in NS mailbox")
 endif()
 
 # In actual NS integration, NS side build should include the source files
@@ -54,7 +57,7 @@
         $<$<STREQUAL:${TEST_PSA_API},IPC>:PSA_API_TEST_IPC>
         $<$<BOOL:${TFM_NS_CLIENT_IDENTIFICATION}>:TFM_NS_CLIENT_IDENTIFICATION>
         $<$<BOOL:${TFM_MULTI_CORE_TOPOLOGY}>:TFM_MULTI_CORE_TOPOLOGY>
-        $<$<BOOL:${TFM_MULTI_CORE_MULTI_CLIENT_CALL}>:TFM_MULTI_CORE_MULTI_CLIENT_CALL>
+        $<$<BOOL:${TFM_MULTI_CORE_NS_OS}>:TFM_MULTI_CORE_NS_OS>
         $<$<BOOL:${FORWARD_PROT_MSG}>:FORWARD_PROT_MSG>
 )
 
@@ -82,7 +85,7 @@
             ${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
+            $<$<BOOL:${TFM_MULTI_CORE_NS_OS}>:${INTERFACE_SRC_DIR}/multi_core/tfm_ns_mailbox_rtos_api.c>
         )
     else()
         target_sources(tfm_api_ns PRIVATE