commit dc6e81c926df63d9519795598e3adc78ea4abe75
author Kevin Peng <kevin.peng@arm.com> Tue Mar 07 17:29:01 2023 +0800
committer Kevin Peng <kevin.peng@arm.com> Mon Mar 13 16:08:47 2023 +0800
tree f6131838d5498ea6f202453b8b2c4292c6b2bd44
parent ee2c3a97e9da11094109178735a7d43af27d2ae0

RPC: Remove option of connection-based API

The connection-based APIs are now always implemented on NS client side
(eRPC Server).
It is not necessary to optionally build them because the config option
is set manually anyway.

This patch removes the optional build and makes them built always.
The grouping of the APIs are kept in case of future use.

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

erpc/client/CMakeLists.txt

diff --git a/erpc/client/CMakeLists.txt b/erpc/client/CMakeLists.txt
index 61a561d..53658aa 100644
--- a/erpc/client/CMakeLists.txt
+++ b/erpc/client/CMakeLists.txt
@@ -52,7 +52,7 @@
         ${ERPC_REPO_PATH}/erpc_c/setup/erpc_setup_mbf_dynamic.cpp
         # Generated files
         ${CMAKE_CURRENT_SOURCE_DIR}/../generated_files/tfm_erpc_psa_client_api_client.cpp
-        $<$<BOOL:${CONFIG_TFM_CONNECTION_BASED_SERVICE_API}>:${CMAKE_CURRENT_SOURCE_DIR}/../generated_files/tfm_erpc_psa_connection_api_client.cpp>
+        ${CMAKE_CURRENT_SOURCE_DIR}/../generated_files/tfm_erpc_psa_connection_api_client.cpp
 )
 
 target_include_directories(erpc_client

erpc/server/CMakeLists.txt

diff --git a/erpc/server/CMakeLists.txt b/erpc/server/CMakeLists.txt
index fe61fb7..0562f7f 100644
--- a/erpc/server/CMakeLists.txt
+++ b/erpc/server/CMakeLists.txt
@@ -38,7 +38,7 @@
         ${ERPC_REPO_PATH}/erpc_c/setup/erpc_server_setup.cpp
         # Generated files
         ${CMAKE_CURRENT_SOURCE_DIR}/../generated_files/tfm_erpc_psa_client_api_server.cpp
-        $<$<BOOL:${CONFIG_TFM_CONNECTION_BASED_SERVICE_API}>:${CMAKE_CURRENT_SOURCE_DIR}/../generated_files/tfm_erpc_psa_connection_api_server.cpp>
+        ${CMAKE_CURRENT_SOURCE_DIR}/../generated_files/tfm_erpc_psa_connection_api_server.cpp
 )
 
 target_include_directories(erpc_server
@@ -57,8 +57,3 @@
         tfm_api_ns
         platform_ns # UART driver header and target config
 )
-
-target_compile_definitions(erpc_server
-    PUBLIC
-        $<$<BOOL:${CONFIG_TFM_CONNECTION_BASED_SERVICE_API}>:CONFIG_TFM_CONNECTION_BASED_SERVICE_API=1>
-)

erpc/server/erpc_server_start.c

diff --git a/erpc/server/erpc_server_start.c b/erpc/server/erpc_server_start.c
index 71fc26d..4d27876 100644
--- a/erpc/server/erpc_server_start.c
+++ b/erpc/server/erpc_server_start.c
@@ -10,17 +10,13 @@
 #include "erpc_mbf_setup.h"
 #include "erpc_server_setup.h"
 #include "tfm_erpc_psa_client_api_server.h"
-#if CONFIG_TFM_CONNECTION_BASED_SERVICE_API == 1
 #include "tfm_erpc_psa_connection_api_server.h"
-#endif
 
 void erpc_server_start(erpc_transport_t transport)
 {
     erpc_server_init(transport, erpc_mbf_dynamic_init());
     erpc_add_service_to_server(create_psa_client_api_service());
-#if CONFIG_TFM_CONNECTION_BASED_SERVICE_API == 1
     erpc_add_service_to_server(create_psa_connection_api_service());
-#endif
 
     erpc_server_run();