Skip to content

Commit e0ea69f

Browse files
hakonfammbolivar-nordic
authored andcommitted
[nrf fromlist] Build: add internal option for configuring type of ...
Upstream PR: https://review.trustedfirmware.org/c/TF-M/trusted-firmware-m/+/10960 This is helpful when a generated file is being used and the location of the generated file is not known when performing the configure stage. Change-Id: Ia8f45cb854b15ee643020fe45122fe0d18cceb0c Signed-off-by: Håkon Øye Amundsen <[email protected]> (cherry picked from commit f734541)
1 parent ea7e003 commit e0ea69f

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

trusted-firmware-m/config/config_default.cmake

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,14 @@ set(MBEDCRYPTO_PATH "DOWNLOAD" CACHE PATH "Path to Mbe
168168
set(MBEDCRYPTO_VERSION "mbedtls-2.26.0" CACHE STRING "The version of Mbed Crypto to use")
169169
set(MBEDCRYPTO_GIT_REMOTE "https://github.com/ARMmbed/mbedtls.git" CACHE STRING "The URL (or path) to retrieve MbedTLS from.")
170170
set(MBEDCRYPTO_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "Build type of Mbed Crypto library")
171-
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")
171+
# Below is the cache type for TFM_MBEDCRYPTO_CONFIG_PATH.
172+
# This is intended to be controlled by an external build system to support relative path.
173+
# Relative paths can be supported with one of:
174+
# - set(TFM_MBEDCRYPTO_CONFIG_TYPE "STRING" CACHE INTERNAL "Internal setting")
175+
# - -DTFM_MBEDCRYPTO_CONFIG_TYPE=STRING
176+
# before config_default.cmake is loaded.
177+
set(TFM_MBEDCRYPTO_CONFIG_TYPE "PATH" CACHE STRING "Type of the *_MBEDCRYPTO_CONFIG_PATH variables, used internally")
178+
set(TFM_MBEDCRYPTO_CONFIG_PATH "${CMAKE_SOURCE_DIR}/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_default.h" CACHE ${TFM_MBEDCRYPTO_CONFIG_TYPE} "Config to use for Mbed Crypto")
172179
set(TFM_MBEDCRYPTO_PLATFORM_EXTRA_CONFIG_PATH "" CACHE PATH "Config to append to standard Mbed Crypto config, used by platforms to cnfigure feature support")
173180

174181
set(TFM_TEST_REPO_PATH "DOWNLOAD" CACHE PATH "Path to TFM-TEST repo (or DOWNLOAD to fetch automatically")

0 commit comments

Comments
 (0)