Merge 'integration' into 'topics/corstone1000'
Refresh the topic branch from integration. Refactor se-proxy
deployment to align with deployment structure changes:
- introduce a CS1K specific infrastructure to se-proxy
deployment
- restore HW independence of "stub" infra of se-proxy
- clean up components added from se-proxy.cmake and
se_proxy_sp.cmake (remove duplicates and add what's missing)
Signed-off-by: Gyorgy Szing <Gyorgy.Szing@arm.com>
Change-Id: Ib7f2c25c5057e95771cc16c3774759933e3f2c9c
diff --git a/deployments/se-proxy/se-proxy.cmake b/deployments/se-proxy/se-proxy.cmake
index 76056c1..2643cfb 100644
--- a/deployments/se-proxy/se-proxy.cmake
+++ b/deployments/se-proxy/se-proxy.cmake
@@ -8,18 +8,7 @@
add_components(TARGET "se-proxy"
BASE_DIR ${TS_ROOT}
COMPONENTS
- "components/common/fdt"
- "components/common/trace"
- "components/common/utils"
- "protocols/rpc/common/packed-c"
- "protocols/service/secure_storage/packed-c"
- "protocols/service/crypto/protobuf"
"components/common/tlv"
- "components/config/ramstore"
- "components/config/loader/sp"
- "components/messaging/ffa/libsp"
- "components/rpc/ffarpc/endpoint"
- "components/rpc/psa_ipc"
"components/rpc/common/interface"
"components/rpc/common/demux"
"components/service/common/include"
@@ -28,6 +17,7 @@
"components/service/common/provider"
"components/service/discovery/provider"
"components/service/discovery/provider/serializer/packed-c"
+ "components/service/crypto/client/psa"
"components/service/crypto/include"
"components/service/crypto/provider"
"components/service/crypto/provider/serializer/protobuf"
@@ -45,26 +35,12 @@
"components/service/crypto/factory/full"
"components/service/secure_storage/include"
"components/service/secure_storage/frontend/secure_storage_provider"
- "components/service/secure_storage/backend/secure_storage_ipc"
"components/service/attestation/include"
"components/service/attestation/provider"
"components/service/attestation/provider/serializer/packed-c"
- "components/service/attestation/reporter/psa_ipc"
- "components/service/attestation/client/psa_ipc"
- "components/messaging/openamp/sp"
-
- # Stub service provider backends
- "components/rpc/dummy"
- "components/rpc/common/caller"
- "components/service/attestation/key_mngr/local"
- "components/service/crypto/backend/psa_ipc"
- "components/service/crypto/client/psa"
- "components/service/secure_storage/backend/mock_store"
-)
-
-target_sources(se-proxy PRIVATE
- ${CMAKE_CURRENT_LIST_DIR}/common/se_proxy_sp.c
- ${CMAKE_CURRENT_LIST_DIR}/common/service_proxy_factory.c
+ "protocols/rpc/common/packed-c"
+ "protocols/service/secure_storage/packed-c"
+ "protocols/service/crypto/protobuf"
)
#-------------------------------------------------------------------------------
@@ -73,17 +49,10 @@
#-------------------------------------------------------------------------------
# Nanopb
-include(../../../external/nanopb/nanopb.cmake)
+include(${TS_ROOT}/external/nanopb/nanopb.cmake)
target_link_libraries(se-proxy PRIVATE nanopb::protobuf-nanopb-static)
protobuf_generate_all(TGT "se-proxy" NAMESPACE "protobuf" BASE_DIR "${TS_ROOT}/protocols")
-# libmetal
-include(../../../external/openamp/libmetal.cmake)
-
-# OpenAMP
-include(../../../external/openamp/openamp.cmake)
-target_link_libraries(se-proxy PRIVATE openamp libmetal)
-
#################################################################
target_include_directories(se-proxy PRIVATE