Adjust build systems
Adjust build systems such as we can built
Mbed TLS in the default and full configuration.
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index edf7790..e1bfbb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -294,12 +294,10 @@
add_subdirectory(include)
-add_subdirectory(3rdparty)
+add_subdirectory(tf-psa-crypto)
add_subdirectory(library)
-add_subdirectory(tf-psa-crypto)
-
add_subdirectory(pkgconfig)
#
@@ -374,7 +372,7 @@
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/library
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/core
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/drivers/builtin/src
- PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/everest/include)
+ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tf-psa-crypto/drivers/everest/include)
# Pass-through MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE
if(MBEDTLS_CONFIG_FILE)
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index fbbeb5b..da109dc 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -326,9 +326,9 @@
foreach(target IN LISTS target_libraries)
add_library(MbedTLS::${target} ALIAS ${target}) # add_subdirectory support
- # Include public header files from /include, tf-psa-crypto/include/ and
- # /tf-psa-crypto/drivers/builtin/include/. Include private header files
- # from /library.
+ # Include public header files from /include, /tf-psa-crypto/include/ and
+ # tf-psa-crypto/drivers/builtin/include/. Include private header files
+ # from /library, tf-psa-crypto/core/ and tf-psa-crypto/drivers/builtin/src/.
target_include_directories(${target}
PUBLIC $<BUILD_INTERFACE:${MBEDTLS_DIR}/include/>
$<BUILD_INTERFACE:${MBEDTLS_DIR}/tf-psa-crypto/include/>
diff --git a/library/Makefile b/library/Makefile
index 7acee56..f7c4898 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -192,7 +192,9 @@
$(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/version_features.o \
# This line is intentionally left blank
-include ../3rdparty/Makefile.inc
+THIRDPARTY_DIR := $(MBEDTLS_PATH)/tf-psa-crypto/drivers
+include $(MBEDTLS_PATH)/tf-psa-crypto/drivers/everest/Makefile.inc
+include $(MBEDTLS_PATH)/tf-psa-crypto/drivers/p256-m/Makefile.inc
LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES)
OBJS_CRYPTO+=$(THIRDPARTY_CRYPTO_OBJECTS)
diff --git a/scripts/common.make b/scripts/common.make
index 077ac6f..21385a3 100644
--- a/scripts/common.make
+++ b/scripts/common.make
@@ -44,7 +44,9 @@
-lmbedcrypto$(SHARED_SUFFIX)
endif
-include $(MBEDTLS_PATH)/3rdparty/Makefile.inc
+THIRDPARTY_DIR = $(MBEDTLS_PATH)/tf-psa-crypto/drivers
+include $(MBEDTLS_PATH)/tf-psa-crypto/drivers/everest/Makefile.inc
+include $(MBEDTLS_PATH)/tf-psa-crypto/drivers/p256-m/Makefile.inc
LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES)
ifdef PSASIM
diff --git a/scripts/data_files/driver_jsons/p256_transparent_driver.json b/scripts/data_files/driver_jsons/p256_transparent_driver.json
index 7d2aabf..4794074 100644
--- a/scripts/data_files/driver_jsons/p256_transparent_driver.json
+++ b/scripts/data_files/driver_jsons/p256_transparent_driver.json
@@ -2,7 +2,7 @@
"prefix": "p256",
"type": "transparent",
"mbedtls/h_condition": "defined(MBEDTLS_PSA_P256M_DRIVER_ENABLED)",
- "headers": ["../3rdparty/p256-m/p256-m_driver_entrypoints.h"],
+ "headers": ["../tf-psa-crypto/drivers/p256-m/p256-m_driver_entrypoints.h"],
"capabilities": [
{
"mbedtls/c_condition": "defined(MBEDTLS_PSA_P256M_DRIVER_ENABLED)",
diff --git a/scripts/generate_visualc_files.pl b/scripts/generate_visualc_files.pl
index 8e38290..d48b2b2 100755
--- a/scripts/generate_visualc_files.pl
+++ b/scripts/generate_visualc_files.pl
@@ -34,12 +34,12 @@
my $test_drivers_source_dir = 'tests/src/drivers';
my @thirdparty_header_dirs = qw(
- 3rdparty/everest/include/everest
+ tf-psa-crypto/drivers/everest/include/everest
);
my @thirdparty_source_dirs = qw(
- 3rdparty/everest/library
- 3rdparty/everest/library/kremlib
- 3rdparty/everest/library/legacy
+ tf-psa-crypto/drivers/everest/library
+ tf-psa-crypto/drivers/everest/library/kremlib
+ tf-psa-crypto/drivers/everest/library/legacy
);
# Directories to add to the include path.
@@ -49,10 +49,10 @@
include
tf-psa-crypto/include
tf-psa-crypto/drivers/builtin/include
- 3rdparty/everest/include/
- 3rdparty/everest/include/everest
- 3rdparty/everest/include/everest/vs2013
- 3rdparty/everest/include/everest/kremlib
+ tf-psa-crypto/drivers/everest/include/
+ tf-psa-crypto/drivers/everest/include/everest
+ tf-psa-crypto/drivers/everest/include/everest/vs2013
+ tf-psa-crypto/drivers/everest/include/everest/kremlib
tests/include
);
my $include_directories = join(';', map {"../../$_"} @include_directories);
@@ -69,7 +69,7 @@
@include_directories));
my @excluded_files = qw(
- 3rdparty/everest/library/Hacl_Curve25519.c
+ tf-psa-crypto/drivers/everest/library/Hacl_Curve25519.c
);
my %excluded_files = ();
foreach (@excluded_files) { $excluded_files{$_} = 1 }
diff --git a/tf-psa-crypto/drivers/CMakeLists.txt b/tf-psa-crypto/drivers/CMakeLists.txt
index f03055e..517b6df 100644
--- a/tf-psa-crypto/drivers/CMakeLists.txt
+++ b/tf-psa-crypto/drivers/CMakeLists.txt
@@ -1 +1,3 @@
add_subdirectory(builtin)
+add_subdirectory(everest)
+add_subdirectory(p256-m)