commit 7f78a8f384397d36998c88196be257706812ff85
author Kevin Peng <kevin.peng@arm.com> Fri Jul 21 14:15:54 2023 +0800
committer Kevin Peng <kevin.peng@arm.com> Mon Jul 31 14:52:01 2023 +0800
tree d3d1ca631678db73f6405063007f908a66634036
parent ac5419bd8833147e9d56314173d352cd05a356cc

RPC: Move RPC codes to RPC folder

Change-Id: If001d31583a865ff3bf8bfefb4d45fb9efec9fcb
Signed-off-by: Kevin Peng <kevin.peng@arm.com>

app/CMakeLists.txt

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 22c0d1c..89ac2f4 100755
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -244,11 +244,8 @@
 endif()
 
 ############################# Test integration #################################
-
-if (CONFIG_TFM_ERPC_TEST_FRAMEWORK)
-    set(CONFIG_ENABLE_NS_UART_TX_RX_CONTROL      ON         CACHE BOOL      "Whether to enable UART TX RX")
-    set(ERPC_DIR     ${CMAKE_CURRENT_SOURCE_DIR}/../erpc)
-    add_subdirectory(${ERPC_DIR}/server ${CMAKE_CURRENT_BINARY_DIR}/erpc/server)
+if(CONFIG_TFM_ERPC_TEST_FRAMEWORK)
+    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../erpc/server/app ${CMAKE_CURRENT_BINARY_DIR}/erpc)
 endif()
 
 add_library(tfm_test_app STATIC EXCLUDE_FROM_ALL)
@@ -256,17 +253,11 @@
 target_sources(tfm_test_app
     PRIVATE
         $<$<NOT:$<BOOL:${CONFIG_TFM_ERPC_TEST_FRAMEWORK}>>:test_app.c>
-        $<$<BOOL:${CONFIG_TFM_ERPC_TEST_FRAMEWORK}>:erpc_app.c>
-        $<$<BOOL:${CONFIG_TFM_ERPC_TEST_FRAMEWORK}>:${ERPC_REPO_PATH}/erpc_c/setup/erpc_setup_uart_cmsis.cpp>
-        $<$<BOOL:${CONFIG_TFM_ERPC_TEST_FRAMEWORK}>:${ERPC_REPO_PATH}/erpc_c/transports/erpc_uart_cmsis_transport.cpp>
 )
 
 target_include_directories(tfm_test_app
     PUBLIC
         .
-        $<$<BOOL:${CONFIG_TFM_ERPC_TEST_FRAMEWORK}>:${ERPC_DIR}/server>
-        $<$<BOOL:${CONFIG_TFM_ERPC_TEST_FRAMEWORK}>:${ERPC_REPO_PATH}/erpc_c/transports>
-        $<$<BOOL:${CONFIG_TFM_ERPC_TEST_FRAMEWORK}>:${ERPC_DIR}/platform/${TFM_PLATFORM}>
 )
 
 target_link_libraries(tfm_test_app
@@ -275,7 +266,7 @@
         $<$<BOOL:${TEST_PSA_API}>:val_nspe>
         $<$<BOOL:${TEST_PSA_API}>:pal_nspe>
         $<$<BOOL:${TEST_PSA_API}>:test_combine>
-        $<$<BOOL:${CONFIG_TFM_ERPC_TEST_FRAMEWORK}>:erpc_server>
+        $<$<BOOL:${CONFIG_TFM_ERPC_TEST_FRAMEWORK}>:erpc_app>
         tfm_api_ns
         tfm_log
 )

erpc/server/app/CMakeLists.txt

diff --git a/erpc/server/app/CMakeLists.txt b/erpc/server/app/CMakeLists.txt
new file mode 100644
index 0000000..83fdb22
--- /dev/null
+++ b/erpc/server/app/CMakeLists.txt
@@ -0,0 +1,34 @@
+#-------------------------------------------------------------------------------
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+#-------------------------------------------------------------------------------
+
+cmake_minimum_required(VERSION 3.15)
+
+set(CONFIG_ENABLE_NS_UART_TX_RX_CONTROL      ON         CACHE BOOL      "Whether to enable UART TX RX")
+set(ERPC_DIR     ${CMAKE_CURRENT_LIST_DIR}/../..)
+
+add_subdirectory(${ERPC_DIR}/server ${CMAKE_CURRENT_BINARY_DIR}/server)
+
+add_library(erpc_app STATIC EXCLUDE_FROM_ALL)
+
+target_sources(erpc_app
+    PRIVATE
+        erpc_app.c
+        ${ERPC_REPO_PATH}/erpc_c/setup/erpc_setup_uart_cmsis.cpp
+        ${ERPC_REPO_PATH}/erpc_c/transports/erpc_uart_cmsis_transport.cpp
+)
+
+target_include_directories(erpc_app
+    PRIVATE
+        ${ERPC_REPO_PATH}/erpc_c/transports
+        ${ERPC_DIR}/platform/${TFM_PLATFORM}
+)
+
+target_link_libraries(erpc_app
+    PRIVATE
+        erpc_server
+        tfm_log
+)

erpc/server/app/erpc_app.c

diff --git a/app/erpc_app.c b/erpc/server/app/erpc_app.c
similarity index 91%
rename from app/erpc_app.c
rename to erpc/server/app/erpc_app.c
index 3ea7b86..341a0f0 100644
--- a/app/erpc_app.c
+++ b/erpc/server/app/erpc_app.c
@@ -5,7 +5,6 @@
  *
  */
 
-#include "test_app.h"
 #include "tfm_log.h"
 #include "erpc_server_start.h"
 #include "config_erpc_target.h"
@@ -20,7 +19,7 @@
 __attribute__((noreturn))
 void test_app(void *argument)
 {
-    UNUSED_VARIABLE(argument);
+    (void)(argument);
 
     erpc_transport_t transport;