Build: Improve NS mailbox config flag setting
Support a flag TFM_MULTI_CORE_NS_OS to control NS integration.
When integrating TF-M with NS OS on dual-cpu platforms, select
TFM_MULTI_CORE_NS_OS in NS build to enable NS OS support in NS
mailbox.
When integrating TF-M with NS bare metal environment, disable
TFM_MULTI_CORE_NS_OS and NS mailbox relies on looping and requires
no support from NS OS.
TFM_MULTI_CORE_MULTI_CLIENT_CALL is removed.
NS mailbox build can get rid of the dependency on the configuration
of TFM_MULTI_CORE_MULTI_CLIENT_CALL in S mailbox build.
NUM_MAILBOX_QUEUE_SLOT directly indicates whether platform and SPE
supports multiple NS PSA Client calls.
Change-Id: I937b2afdb88cccc22a20617d2ab36bcc1b939b05
Signed-off-by: David Hu <david.hu@arm.com>
diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt
index 5e493b1..93f5068 100755
--- a/platform/CMakeLists.txt
+++ b/platform/CMakeLists.txt
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2021, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -96,7 +96,6 @@
PRIVATE
$<$<BOOL:${TFM_IRQ_TEST}>:TFM_ENABLE_IRQ_TEST>
$<$<BOOL:${TFM_PERIPH_ACCESS_TEST}>:TFM_ENABLE_PERIPH_ACCESS_TEST>
- $<$<BOOL:${TFM_MULTI_CORE_MULTI_CLIENT_CALL}>:TFM_MULTI_CORE_MULTI_CLIENT_CALL>
)
#========================= Platform BL2 =======================================#
diff --git a/platform/ext/target/cypress/psoc64/CMakeLists.txt b/platform/ext/target/cypress/psoc64/CMakeLists.txt
index 75510db..d97d682 100644
--- a/platform/ext/target/cypress/psoc64/CMakeLists.txt
+++ b/platform/ext/target/cypress/psoc64/CMakeLists.txt
@@ -198,7 +198,6 @@
target_compile_definitions(platform_ns
PUBLIC
- TFM_MULTI_CORE_MULTI_CLIENT_CALL
RTE_USART5
)
diff --git a/platform/ext/target/cypress/psoc64/config.cmake b/platform/ext/target/cypress/psoc64/config.cmake
index 24bc3c0..b1d7532 100644
--- a/platform/ext/target/cypress/psoc64/config.cmake
+++ b/platform/ext/target/cypress/psoc64/config.cmake
@@ -14,7 +14,6 @@
############################ Platform ##########################################
set(TFM_MULTI_CORE_TOPOLOGY ON CACHE BOOL "Whether to build for a dual-cpu architecture")
-set(TFM_MULTI_CORE_MULTI_CLIENT_CALL ON CACHE BOOL "Whether to enable multiple PSA client calls feature")
set(NUM_MAILBOX_QUEUE_SLOT 4 CACHE BOOL "Number of mailbox queue slots")
set(PLATFORM_DUMMY_ATTEST_HAL FALSE CACHE BOOL "Use dummy attest hal implementation. Should not be used in production.")
diff --git a/platform/ext/target/cypress/psoc64/mailbox/platform_multicore.c b/platform/ext/target/cypress/psoc64/mailbox/platform_multicore.c
index e860ae0..2c41e8e 100644
--- a/platform/ext/target/cypress/psoc64/mailbox/platform_multicore.c
+++ b/platform/ext/target/cypress/psoc64/mailbox/platform_multicore.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2021 Arm Limited. All rights reserved.
* Copyright (c) 2019 Cypress Semiconductor Corporation. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
@@ -9,7 +9,6 @@
#include "platform_multicore.h"
#include "tfm_multi_core_api.h"
-#include "tfm_ns_mailbox.h"
#include "cy_ipc_drv.h"
#include "cy_sysint.h"
diff --git a/platform/ext/target/musca_b1/sse_200/config.cmake b/platform/ext/target/musca_b1/sse_200/config.cmake
index 67e5a68..1b6a0c7 100644
--- a/platform/ext/target/musca_b1/sse_200/config.cmake
+++ b/platform/ext/target/musca_b1/sse_200/config.cmake
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2021, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -16,7 +16,6 @@
endif()
set(BL0 OFF)
else()
- set(TFM_MULTI_CORE_MULTI_CLIENT_CALL OFF CACHE BOOL "Whether to enable multiple PSA client calls feature")
set(MCUBOOT_IMAGE_NUMBER 1 CACHE STRING "Whether to combine S and NS into either 1 image, or sign each seperately")
set(MCUBOOT_MEASURED_BOOT OFF CACHE BOOL "Add boot measurement values to boot status. Used for initial attestation token")
set(TFM_PSA_API ON CACHE BOOL "Use PSA api (IPC mode) instead of secure library mode")