Build: Change NS log from interface to test log system
The NS binary in tf-m-tests repo should use its own log
implementations.
This part is missed on the new build system.
This patch fixes this by:
1. Add the tfm NS library into build (the library CMake is added
by the test repo)
2. Remove the build of log under interface for NS API
Change-Id: Ib25758950700e819863d278f4a97dcae70bedaa1
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb6e840..388cc5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,6 +85,7 @@
if(NS)
# Set to ${TFM_TEST_REPO_PATH}/app by default
add_subdirectory(${TFM_APP_PATH} ${CMAKE_CURRENT_BINARY_DIR}/app)
+ add_subdirectory(${TFM_NS_LOG_PATH} ${CMAKE_CURRENT_BINARY_DIR}/ns_log)
endif()
add_subdirectory(secure_fw)
add_subdirectory(interface)
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 7be967a..00e0fbb 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -67,7 +67,6 @@
PRIVATE
$<$<BOOL:${TFM_NS_CLIENT_IDENTIFICATION}>:src/tfm_nspm_svc_handler.c>
$<$<BOOL:${TFM_NS_CLIENT_IDENTIFICATION}>:src/tfm_nspm_api.c>
- ${CMAKE_CURRENT_SOURCE_DIR}/src/log/tfm_log_raw.c
)
if (${TFM_PSA_API})
diff --git a/lib/ext/tf-m-tests/CMakeLists.txt b/lib/ext/tf-m-tests/CMakeLists.txt
index df457fd..3a1e60d 100644
--- a/lib/ext/tf-m-tests/CMakeLists.txt
+++ b/lib/ext/tf-m-tests/CMakeLists.txt
@@ -38,3 +38,7 @@
if (NOT TFM_TEST_PATH)
set(TFM_TEST_PATH ${TFM_TEST_REPO_PATH}/test CACHE PATH "Path to TFM tests" FORCE)
endif()
+
+if (NOT TFM_NS_LOG_PATH)
+ set(TFM_NS_LOG_PATH ${TFM_TEST_REPO_PATH}/log CACHE PATH "Path to NS log" FORCE)
+endif()