Dualcpu: Move dual-cpu NS files into a dedicated folder
Gather all the dual-cpu NS .c files in a dedicated folder
multi_core under interface/src.
Put all the dual-cpu interface header files in a dedicated folder
multi-core under interface/include.
Change-Id: Ia6847eb03a663e66260690ad88addb1521f13fcd
Signed-off-by: David Hu <david.hu@arm.com>
diff --git a/cmake/install.cmake b/cmake/install.cmake
index cb7f100..981bfba 100644
--- a/cmake/install.cmake
+++ b/cmake/install.cmake
@@ -53,9 +53,9 @@
DESTINATION ${INSTALL_INTERFACE_INC_DIR}/ext)
if (TFM_MULTI_CORE_TOPOLOGY)
- install(FILES ${INTERFACE_INC_DIR}/tfm_multi_core_api.h
- ${INTERFACE_INC_DIR}/tfm_ns_mailbox.h
- ${INTERFACE_INC_DIR}/tfm_mailbox.h
+ install(FILES ${INTERFACE_INC_DIR}/multi_core/tfm_multi_core_api.h
+ ${INTERFACE_INC_DIR}/multi_core/tfm_ns_mailbox.h
+ ${INTERFACE_INC_DIR}/multi_core/tfm_mailbox.h
DESTINATION ${INSTALL_INTERFACE_INC_DIR})
else()
install(FILES ${CMAKE_BINARY_DIR}/generated/interface/include/tfm_veneers.h
@@ -112,10 +112,10 @@
####################### export sources #########################################
if (TFM_MULTI_CORE_TOPOLOGY)
- install(FILES ${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
+ install(FILES ${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
DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
else()
install(FILES ${INTERFACE_SRC_DIR}/tfm_ns_interface.c
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 276a720..0351754 100644
--- a/interface/CMakeLists.txt
+++ b/interface/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
#
@@ -27,6 +27,7 @@
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_BINARY_DIR}/generated/interface/include
${CMAKE_CURRENT_SOURCE_DIR}/include/os_wrapper
+ $<$<OR:$<BOOL:${FORWARD_PROT_MSG}>,$<BOOL:${TFM_MULTI_CORE_TOPOLOGY}>>:${CMAKE_CURRENT_SOURCE_DIR}/include/multi_core>
)
# PSA interface files are generated from a template
diff --git a/interface/include/tfm_mailbox.h b/interface/include/multi_core/tfm_mailbox.h
similarity index 100%
rename from interface/include/tfm_mailbox.h
rename to interface/include/multi_core/tfm_mailbox.h
diff --git a/interface/include/tfm_multi_core_api.h b/interface/include/multi_core/tfm_multi_core_api.h
similarity index 100%
rename from interface/include/tfm_multi_core_api.h
rename to interface/include/multi_core/tfm_multi_core_api.h
diff --git a/interface/include/tfm_ns_mailbox.h b/interface/include/multi_core/tfm_ns_mailbox.h
similarity index 100%
rename from interface/include/tfm_ns_mailbox.h
rename to interface/include/multi_core/tfm_ns_mailbox.h
diff --git a/interface/src/tfm_multi_core_ns_api.c b/interface/src/multi_core/tfm_multi_core_ns_api.c
similarity index 100%
rename from interface/src/tfm_multi_core_ns_api.c
rename to interface/src/multi_core/tfm_multi_core_ns_api.c
diff --git a/interface/src/tfm_multi_core_psa_ns_api.c b/interface/src/multi_core/tfm_multi_core_psa_ns_api.c
similarity index 100%
rename from interface/src/tfm_multi_core_psa_ns_api.c
rename to interface/src/multi_core/tfm_multi_core_psa_ns_api.c
diff --git a/interface/src/tfm_ns_mailbox.c b/interface/src/multi_core/tfm_ns_mailbox.c
similarity index 100%
rename from interface/src/tfm_ns_mailbox.c
rename to interface/src/multi_core/tfm_ns_mailbox.c
diff --git a/interface/src/tfm_ns_mailbox_rtos_api.c b/interface/src/multi_core/tfm_ns_mailbox_rtos_api.c
similarity index 100%
rename from interface/src/tfm_ns_mailbox_rtos_api.c
rename to interface/src/multi_core/tfm_ns_mailbox_rtos_api.c
diff --git a/secure_fw/partitions/psa_proxy/CMakeLists.txt b/secure_fw/partitions/psa_proxy/CMakeLists.txt
index 4aad255..5db47e9 100644
--- a/secure_fw/partitions/psa_proxy/CMakeLists.txt
+++ b/secure_fw/partitions/psa_proxy/CMakeLists.txt
@@ -27,7 +27,7 @@
PRIVATE
psa_proxy.c
psa_proxy_shared_mem_mngr.c
- ../../../interface/src/tfm_ns_mailbox.c
+ ../../../interface/src/multi_core/tfm_ns_mailbox.c
)
# The generated sources