commit 0eca5eaf4ffb7a2641f7d60a7f4b8d38128b471b
author Kevin Peng <kevin.peng@arm.com> Fri Jul 21 17:32:31 2023 +0800
committer Kevin Peng <kevin.peng@arm.com> Mon Jul 31 14:52:01 2023 +0800
tree 4da3efb9b1f2b1fd5758a910b43cba142ed06506
parent 7f78a8f384397d36998c88196be257706812ff85

RPC: Merge RPC PSA Client APIs

Originally, connection-based APIs are optional, depends on whether the
TF-M provides any.
So the RPC APIs are also separated so that they can be selected.

Later, the APIs are always provided with returning NOT SUPPORTED in case
of no connection-based APIs.
And the RPC test framework followed up by always building all the APIs.

This patch makes it further by merging all the APIs.

Change-Id: I923c24e5e83cae4e3d8f4774d776dbe8d07610c2
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 53658aa..9472dc0 100644
--- a/erpc/client/CMakeLists.txt
+++ b/erpc/client/CMakeLists.txt
@@ -51,8 +51,7 @@
         ${ERPC_REPO_PATH}/erpc_c/setup/erpc_client_setup.cpp
         ${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
-        ${CMAKE_CURRENT_SOURCE_DIR}/../generated_files/tfm_erpc_psa_connection_api_client.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../generated_files/tfm_erpc_client.cpp
 )
 
 target_include_directories(erpc_client

erpc/client/erpc_client_wrapper.c

diff --git a/erpc/client/erpc_client_wrapper.c b/erpc/client/erpc_client_wrapper.c
index 37b5f82..4b23f5f 100644
--- a/erpc/client/erpc_client_wrapper.c
+++ b/erpc/client/erpc_client_wrapper.c
@@ -7,7 +7,7 @@
 
 #include <stddef.h>
 #include "psa/client.h"
-#include "tfm_erpc_psa_client_api.h"
+#include "tfm_erpc.h"
 
 psa_status_t psa_call(psa_handle_t handle, int32_t type,
                       const psa_invec *in_vec, size_t in_len,