aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/config_default.cmake3
-rw-r--r--lib/ext/mbedcrypto/CMakeLists.txt4
-rw-r--r--lib/ext/tf-m-tests/CMakeLists.txt1
3 files changed, 5 insertions, 3 deletions
diff --git a/config/config_default.cmake b/config/config_default.cmake
index 648c357c2d..065a74ac2d 100644
--- a/config/config_default.cmake
+++ b/config/config_default.cmake
@@ -123,12 +123,13 @@ set(TFM_CRYPTO_TEST_HKDF ON CACHE BOOL "Test SHA-51
################################## Dependencies ################################
set(MBEDCRYPTO_PATH "DOWNLOAD" CACHE PATH "Path to Mbed Crypto (or DOWNLOAD to fetch automatically")
-set(MBEDCRYPTO_VERSION "2.23.0" CACHE STRING "The version of Mbed Crypto to use")
+set(MBEDCRYPTO_VERSION "mbedtls-2.23.0" CACHE STRING "The version of Mbed Crypto to use")
set(MBEDCRYPTO_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "Build type of Mbed Crypto library")
set(TFM_MBEDCRYPTO_CONFIG_PATH "${CMAKE_SOURCE_DIR}/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_default.h" CACHE PATH "Config to use for Mbed Crypto")
set(TFM_MBEDCRYPTO_PLATFORM_EXTRA_CONFIG_PATH "" CACHE PATH "Config to append to standard Mbed Crypto config, used by platforms to cnfigure feature support")
set(TFM_TEST_REPO_PATH "DOWNLOAD" CACHE PATH "Path to TFM-TEST repo (or DOWNLOAD to fetch automatically")
+set(TFM_TEST_REPO_VERSION "master" CACHE PATH "The version of tf-m-tests to use")
set(CMSIS_5_PATH "DOWNLOAD" CACHE PATH "Path to CMSIS_5 (or DOWNLOAD to fetch automatically")
set(MCUBOOT_PATH "DOWNLOAD" CACHE PATH "Path to MCUboot (or DOWNLOAD to fetch automatically")
diff --git a/lib/ext/mbedcrypto/CMakeLists.txt b/lib/ext/mbedcrypto/CMakeLists.txt
index 828a188677..79adce160a 100644
--- a/lib/ext/mbedcrypto/CMakeLists.txt
+++ b/lib/ext/mbedcrypto/CMakeLists.txt
@@ -20,7 +20,7 @@ if ("${MBEDCRYPTO_PATH}" STREQUAL "DOWNLOAD")
if (PATCH_FILES)
FetchContent_Declare(mbedcrypto
GIT_REPOSITORY https://github.com/ARMmbed/mbedtls.git
- GIT_TAG mbedtls-${MBEDCRYPTO_VERSION}
+ GIT_TAG ${MBEDCRYPTO_VERSION}
GIT_SHALLOW TRUE
GIT_PROGRESS TRUE
GIT_SUBMODULES ""
@@ -29,7 +29,7 @@ if ("${MBEDCRYPTO_PATH}" STREQUAL "DOWNLOAD")
else()
FetchContent_Declare(mbedcrypto
GIT_REPOSITORY https://github.com/ARMmbed/mbedtls.git
- GIT_TAG mbedtls-${MBEDCRYPTO_VERSION}
+ GIT_TAG ${MBEDCRYPTO_VERSION}
GIT_SHALLOW TRUE
GIT_PROGRESS TRUE
GIT_SUBMODULES ""
diff --git a/lib/ext/tf-m-tests/CMakeLists.txt b/lib/ext/tf-m-tests/CMakeLists.txt
index 3a1e60d17d..b26a0fde98 100644
--- a/lib/ext/tf-m-tests/CMakeLists.txt
+++ b/lib/ext/tf-m-tests/CMakeLists.txt
@@ -16,6 +16,7 @@ endif()
if ("${TFM_TEST_REPO_PATH}" STREQUAL "DOWNLOAD")
FetchContent_Declare(tfm_test_repo
GIT_REPOSITORY https://git.trustedfirmware.org/TF-M/tf-m-tests.git
+ GIT_TAG ${TFM_TEST_REPO_VERSION}
GIT_SHALLOW TRUE
GIT_PROGRESS TRUE
)