Remove SP dev kit external component
Remove all references to SP dev kit from opteesp deployments and b-test
files.
Signed-off-by: Imre Kis <imre.kis@arm.com>
Change-Id: I3752ec4fc0046c576ab658bca81cad9a21cb1fa8
diff --git a/deployments/attestation/opteesp/CMakeLists.txt b/deployments/attestation/opteesp/CMakeLists.txt
index 49bba4c..eebf79d 100644
--- a/deployments/attestation/opteesp/CMakeLists.txt
+++ b/deployments/attestation/opteesp/CMakeLists.txt
@@ -23,14 +23,6 @@
set(SP_UUID "a1baf155-8876-4695-8f7c-54955e8db974")
set(TRACE_PREFIX "ATT" CACHE STRING "Trace prefix")
-
-# Include SP DEV KIT interface
-set(SP_DEV_KIT_INC_DIR ${CMAKE_CURRENT_LIST_DIR})
-list(APPEND CMAKE_MODULE_PATH "${TS_ROOT}/external/Spdevkit")
-find_package(Spdevkit REQUIRED)
-sp_dev_kit_configure_linking(TARGET attestation DEFINES ARM64=1)
-target_link_libraries(attestation PRIVATE ${SP_DEV_KIT_LIBRARIES})
-
#-------------------------------------------------------------------------------
# Default deployment specific configuration
#
@@ -97,13 +89,16 @@
#
#-------------------------------------------------------------------------------
+# Get libc include dir
+get_property(LIBC_INCLUDE_PATH TARGET c PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+
# Qcbor
-set (QCBOR_EXTERNAL_INCLUDE_PATHS ${SP_DEV_KIT_INCLUDE_DIR})
+set (QCBOR_EXTERNAL_INCLUDE_PATHS ${LIBC_INCLUDE_PATH})
include(${TS_ROOT}/external/qcbor/qcbor.cmake)
target_link_libraries(attestation PRIVATE qcbor)
# t_cose
-set (TCOSE_EXTERNAL_INCLUDE_PATHS ${SP_DEV_KIT_INCLUDE_DIR})
+set (TCOSE_EXTERNAL_INCLUDE_PATHS ${LIBC_INCLUDE_PATH})
include(${TS_ROOT}/external/t_cose/t_cose.cmake)
target_link_libraries(attestation PRIVATE t_cose)
diff --git a/deployments/crypto/opteesp/CMakeLists.txt b/deployments/crypto/opteesp/CMakeLists.txt
index a9b1b90..16417b1 100644
--- a/deployments/crypto/opteesp/CMakeLists.txt
+++ b/deployments/crypto/opteesp/CMakeLists.txt
@@ -23,14 +23,6 @@
set(SP_UUID "d9df52d5-16a2-4bb2-9aa4-d26d3b84e8c0")
set(TRACE_PREFIX "CRYPTO" CACHE STRING "Trace prefix")
-
-# Include SP DEV KIT interface
-set(SP_DEV_KIT_INC_DIR ${CMAKE_CURRENT_LIST_DIR})
-list(APPEND CMAKE_MODULE_PATH "${TS_ROOT}/external/Spdevkit")
-find_package(Spdevkit REQUIRED)
-sp_dev_kit_configure_linking(TARGET crypto-sp DEFINES ARM64=1)
-target_link_libraries(crypto-sp PRIVATE ${SP_DEV_KIT_LIBRARIES})
-
#-------------------------------------------------------------------------------
# Components that are specific to deployment in the opteesp environment.
#
@@ -94,18 +86,20 @@
#
#-------------------------------------------------------------------------------
+# Get libc include dir
+get_property(LIBC_INCLUDE_PATH TARGET c PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+
# Nanopb
-list(APPEND NANOPB_EXTERNAL_INCLUDE_PATHS ${SP_DEV_KIT_INCLUDE_DIR})
+list(APPEND NANOPB_EXTERNAL_INCLUDE_PATHS ${LIBC_INCLUDE_PATH})
include(../../../external/nanopb/nanopb.cmake)
target_link_libraries(crypto-sp PRIVATE nanopb::protobuf-nanopb-static)
protobuf_generate_all(TGT "crypto-sp" NAMESPACE "protobuf" BASE_DIR "${TS_ROOT}/protocols")
# Mbed TLS provides libmbedcrypto
-list(APPEND MBEDTLS_EXTRA_INCLUDES ${SP_DEV_KIT_INCLUDE_DIR})
-set(MBEDTLS_EXTRA_INCLUDES ${MBEDTLS_EXTRA_INCLUDES}
- CACHE STRING "PSA ITS for Mbed TLS" FORCE)
+list(APPEND MBEDTLS_EXTRA_INCLUDES ${LIBC_INCLUDE_PATH})
include(../../../external/MbedTLS/MbedTLS.cmake)
target_link_libraries(crypto-sp PRIVATE mbedcrypto)
+target_link_libraries(mbedcrypto INTERFACE c)
if(CMAKE_CROSSCOMPILING)
target_link_libraries(crypto-sp PRIVATE stdc++ gcc m)
diff --git a/deployments/crypto/opteesp/optee_sp_user_defines.h b/deployments/crypto/opteesp/optee_sp_user_defines.h
index 88e1adc..2d7ba50 100644
--- a/deployments/crypto/opteesp/optee_sp_user_defines.h
+++ b/deployments/crypto/opteesp/optee_sp_user_defines.h
@@ -17,6 +17,6 @@
#define OPTEE_SP_STACK_SIZE (64 * 1024)
/* Provisioned heap size */
-#define OPTEE_SP_HEAP_SIZE (480 * 1024)
+#define OPTEE_SP_HEAP_SIZE (490 * 1024)
#endif /* SP_HEADER_DEFINES_H */
diff --git a/deployments/env-test/env_test.cmake b/deployments/env-test/env_test.cmake
index 87a3298..bebd9f5 100644
--- a/deployments/env-test/env_test.cmake
+++ b/deployments/env-test/env_test.cmake
@@ -44,9 +44,10 @@
#
#-------------------------------------------------------------------------------
+# Get libc include dir
+get_property(LIBC_INCLUDE_PATH TARGET c PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+
# Mbed TLS provides libmbedcrypto
-list(APPEND MBEDTLS_EXTRA_INCLUDES ${SP_DEV_KIT_INCLUDE_DIR})
-set(MBEDTLS_EXTRA_INCLUDES ${MBEDTLS_EXTRA_INCLUDES}
- CACHE STRING "PSA ITS for Mbed TLS" FORCE)
+list(APPEND MBEDTLS_EXTRA_INCLUDES ${LIBC_INCLUDE_PATH})
include(${TS_ROOT}/external/MbedTLS/MbedTLS.cmake)
target_link_libraries(env-test PRIVATE mbedcrypto)
diff --git a/deployments/env-test/opteesp/CMakeLists.txt b/deployments/env-test/opteesp/CMakeLists.txt
index d75f74f..58f9c02 100644
--- a/deployments/env-test/opteesp/CMakeLists.txt
+++ b/deployments/env-test/opteesp/CMakeLists.txt
@@ -24,14 +24,6 @@
set(SP_UUID "33c75baf-ac6a-4fe4-8ac7-e9909bee2d17")
set(TRACE_PREFIX "ENVTEST" CACHE STRING "Trace prefix")
-
-# Include SP DEV KIT interface
-set(SP_DEV_KIT_INC_DIR ${CMAKE_CURRENT_LIST_DIR})
-list(APPEND CMAKE_MODULE_PATH "${TS_ROOT}/external/Spdevkit")
-find_package(Spdevkit REQUIRED)
-sp_dev_kit_configure_linking(TARGET env-test DEFINES ARM64=1)
-target_link_libraries(env-test PRIVATE ${SP_DEV_KIT_LIBRARIES})
-
#-------------------------------------------------------------------------------
# Components that are env-test specific to deployment in the opteesp
# environment.
diff --git a/deployments/internal-trusted-storage/opteesp/CMakeLists.txt b/deployments/internal-trusted-storage/opteesp/CMakeLists.txt
index 25d910b..fb51b13 100644
--- a/deployments/internal-trusted-storage/opteesp/CMakeLists.txt
+++ b/deployments/internal-trusted-storage/opteesp/CMakeLists.txt
@@ -20,15 +20,6 @@
set(SP_UUID "dc1eef48-b17a-4ccf-ac8b-dfcff7711b14")
set(TRACE_PREFIX "ITS" CACHE STRING "Trace prefix")
-
-# Include SP DEV KIT interface
-set(SP_DEV_KIT_INC_DIR ${CMAKE_CURRENT_LIST_DIR})
-list(APPEND CMAKE_MODULE_PATH "${TS_ROOT}/external/Spdevkit")
-find_package(Spdevkit COMPONENTS SP_HEADER interface)
-
-sp_dev_kit_configure_linking(TARGET internal-trusted-storage DEFINES ARM64=1)
-target_link_libraries(internal-trusted-storage ${SP_DEV_KIT_LIBRARIES})
-
add_components(TARGET "internal-trusted-storage"
BASE_DIR ${TS_ROOT}
COMPONENTS
diff --git a/deployments/libsp/opteesp/CMakeLists.txt b/deployments/libsp/opteesp/CMakeLists.txt
index 6f3907f..19dede4 100644
--- a/deployments/libsp/opteesp/CMakeLists.txt
+++ b/deployments/libsp/opteesp/CMakeLists.txt
@@ -25,20 +25,11 @@
add_library(sp STATIC)
-# Include SP DEV KIT interface
-set(SP_DEV_KIT_INC_DIR ${CMAKE_CURRENT_LIST_DIR})
-list(APPEND CMAKE_MODULE_PATH "${TS_ROOT}/external/Spdevkit")
-find_package(Spdevkit COMPONENTS interface)
-
-target_link_libraries(sp PUBLIC ${SP_DEV_KIT_LIBRARIES})
-
-
add_components(TARGET "sp"
BASE_DIR ${TS_ROOT}
COMPONENTS
components/messaging/ffa/libsp
components/common/utils
- environments/opteesp
)
target_compile_definitions("sp" PRIVATE
@@ -48,6 +39,7 @@
if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
target_compile_options("sp" PRIVATE
-fdiagnostics-show-option
+ -fpic
-gdwarf-2
-mstrict-align
-O0
@@ -73,9 +65,6 @@
libsp
)
-#These would install the spdevkit content.
-#install(FILES $<TARGET_PROPERTY:sp_devkit_ifc,INTERFACE_LINK_LIBRARIES> DESTINATION lib)
-#install(FILES $<TARGET_PROPERTY:sp_devkit_ifc,INTERFACE_INCLUDE_DIRECTORIES>/ DESTINATION include)
### Create a config file package.
set(ConfigPackageLocation ${TS_ENV}/lib/cmake/libsp)
@@ -124,7 +113,6 @@
FILES
"${CMAKE_CURRENT_BINARY_DIR}/LibspConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/LibspConfigVersion.cmake"
- "${TS_ROOT}/external/Spdevkit/FindSpdevkit.cmake"
DESTINATION
${ConfigPackageLocation}
COMPONENT
diff --git a/deployments/libsp/opteesp/LibspConfig.cmake.in b/deployments/libsp/opteesp/LibspConfig.cmake.in
index cd8d0d6..559b35d 100644
--- a/deployments/libsp/opteesp/LibspConfig.cmake.in
+++ b/deployments/libsp/opteesp/LibspConfig.cmake.in
@@ -1,16 +1,9 @@
#
-# Copyright (c) 2020, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@PACKAGE_INIT@
-# Any user of the lib will depend on spdevkit. Use our find module to get access to it.
-find_package(Spdevkit
- COMPONENTS LIBUTIL
- PATHS ${CMAKE_CURRENT_LIST_DIR}
- NO_DEFAULT_PATH
- REQUIRED)
-
include("${CMAKE_CURRENT_LIST_DIR}/LibspTargets.cmake")
diff --git a/deployments/protected-storage/opteesp/CMakeLists.txt b/deployments/protected-storage/opteesp/CMakeLists.txt
index e7f154a..15fea17 100644
--- a/deployments/protected-storage/opteesp/CMakeLists.txt
+++ b/deployments/protected-storage/opteesp/CMakeLists.txt
@@ -20,15 +20,6 @@
set(SP_UUID "751bf801-3dde-4768-a514-0f10aeed1790")
set(TRACE_PREFIX "PS" CACHE STRING "Trace prefix")
-
-# Include SP DEV KIT interface
-set(SP_DEV_KIT_INC_DIR ${CMAKE_CURRENT_LIST_DIR})
-list(APPEND CMAKE_MODULE_PATH "${TS_ROOT}/external/Spdevkit")
-find_package(Spdevkit COMPONENTS SP_HEADER interface)
-
-sp_dev_kit_configure_linking(TARGET protected-storage DEFINES ARM64=1)
-target_link_libraries(protected-storage ${SP_DEV_KIT_LIBRARIES})
-
add_components(TARGET "protected-storage"
BASE_DIR ${TS_ROOT}
COMPONENTS
diff --git a/deployments/se-proxy/opteesp/CMakeLists.txt b/deployments/se-proxy/opteesp/CMakeLists.txt
index 23a5c62..433323c 100644
--- a/deployments/se-proxy/opteesp/CMakeLists.txt
+++ b/deployments/se-proxy/opteesp/CMakeLists.txt
@@ -24,16 +24,6 @@
set(SP_UUID "46bb39d1-b4d9-45b5-88ff-040027dab249")
#-------------------------------------------------------------------------------
-# Include SP DEV KIT interface
-#
-#-------------------------------------------------------------------------------
-set(SP_DEV_KIT_INC_DIR ${CMAKE_CURRENT_LIST_DIR})
-list(APPEND CMAKE_MODULE_PATH "${TS_ROOT}/external/Spdevkit")
-find_package(Spdevkit REQUIRED)
-sp_dev_kit_configure_linking(TARGET se-proxy DEFINES ARM64=1)
-target_link_libraries(se-proxy PRIVATE ${SP_DEV_KIT_LIBRARIES})
-
-#-------------------------------------------------------------------------------
# Components that are specific to deployment in the opteesp environment.
#
#-------------------------------------------------------------------------------
@@ -104,8 +94,11 @@
#
#-------------------------------------------------------------------------------
+# Get libc include dir
+get_property(LIBC_INCLUDE_PATH TARGET c PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+
# Nanopb
-list(APPEND NANOPB_EXTERNAL_INCLUDE_PATHS ${SP_DEV_KIT_INCLUDE_DIR})
+list(APPEND NANOPB_EXTERNAL_INCLUDE_PATHS ${LIBC_INCLUDE_PATH})
include(../../../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")
diff --git a/deployments/sfs-demo/opteesp/CMakeLists.txt b/deployments/sfs-demo/opteesp/CMakeLists.txt
index 05b338a..2865585 100644
--- a/deployments/sfs-demo/opteesp/CMakeLists.txt
+++ b/deployments/sfs-demo/opteesp/CMakeLists.txt
@@ -19,15 +19,6 @@
set(SP_UUID "01109cf8-e5ca-446f-9b55-f3cdc65110c8")
set(TRACE_PREFIX "SFSDEMO" CACHE STRING "Trace prefix")
-
-# Include SP DEV KIT interface
-set(SP_DEV_KIT_INC_DIR ${CMAKE_CURRENT_LIST_DIR})
-list(APPEND CMAKE_MODULE_PATH "${TS_ROOT}/external/Spdevkit")
-find_package(Spdevkit REQUIRED)
-sp_dev_kit_configure_linking(TARGET sfs-demo DEFINES ARM64=1)
-target_link_libraries(sfs-demo ${SP_DEV_KIT_LIBRARIES})
-
-
add_components(TARGET "sfs-demo"
BASE_DIR ${TS_ROOT}
COMPONENTS
diff --git a/deployments/smm-gateway/opteesp/CMakeLists.txt b/deployments/smm-gateway/opteesp/CMakeLists.txt
index c3f2674..7cf6a7b 100644
--- a/deployments/smm-gateway/opteesp/CMakeLists.txt
+++ b/deployments/smm-gateway/opteesp/CMakeLists.txt
@@ -26,13 +26,6 @@
set(MM_COMM_BUFFER_ADDRESS "0x00000008 0x81000000" CACHE STRING "Address of MM communicte buffer in 64 bit DTS format")
set(MM_COMM_BUFFER_PAGE_COUNT "8" CACHE STRING "Size of the MM communicate buffer in 4k pages")
-# Include SP DEV KIT interface
-set(SP_DEV_KIT_INC_DIR ${CMAKE_CURRENT_LIST_DIR})
-list(APPEND CMAKE_MODULE_PATH "${TS_ROOT}/external/Spdevkit")
-find_package(Spdevkit REQUIRED)
-sp_dev_kit_configure_linking(TARGET smm-gateway DEFINES ARM64=1)
-target_link_libraries(smm-gateway PRIVATE ${SP_DEV_KIT_LIBRARIES})
-
#-------------------------------------------------------------------------------
# Components that are specific to deployment in the opteesp environment.
#