aboutsummaryrefslogtreecommitdiff
path: root/bl2
diff options
context:
space:
mode:
authorRobert Rostohar <Robert.Rostohar@arm.com>2020-12-21 11:25:29 +0100
committerTamas Ban <tamas.ban@arm.com>2021-03-19 09:50:30 +0100
commitd975819863eb8c30aea16160fd4e4c1267d86f87 (patch)
tree5001a133d024baf6045489ffecd3b33e7a3542e9 /bl2
parent55e5e6b1fcf7453a32f15342e33b2f621d3a38f2 (diff)
downloadtrusted-firmware-m-d975819863eb8c30aea16160fd4e4c1267d86f87.tar.gz
Boot: Move Mbed TLS configuration file for MCUboot
Move the configuration template to a standalone 'config' directory. Enables support for CMSIS-Packs. Avoids that the configuration template from the pack is in the include search path together with other include files from the same 'include' directory. Configuration file is copied to the project and its directory is added to the include search path. Signed-off-by: Robert Rostohar <Robert.Rostohar@arm.com> Change-Id: I39afeafdcbf26e83a73c711cf1ae86e5e2667b1d
Diffstat (limited to 'bl2')
-rw-r--r--bl2/CMakeLists.txt2
-rw-r--r--bl2/ext/mcuboot/config/mcuboot-mbedtls-cfg.h (renamed from bl2/ext/mcuboot/include/mcuboot-mbedtls-cfg.h)0
2 files changed, 1 insertions, 1 deletions
diff --git a/bl2/CMakeLists.txt b/bl2/CMakeLists.txt
index 73deeb81f..0fc72d61e 100644
--- a/bl2/CMakeLists.txt
+++ b/bl2/CMakeLists.txt
@@ -60,7 +60,7 @@ target_compile_definitions(bl2_mbedcrypto_config
INTERFACE
$<$<STREQUAL:${MCUBOOT_SIGNATURE_TYPE},RSA>:MCUBOOT_SIGN_RSA>
$<$<STREQUAL:${MCUBOOT_SIGNATURE_TYPE},RSA>:MCUBOOT_SIGN_RSA_LEN=${MCUBOOT_SIGNATURE_KEY_LEN}>
- MBEDTLS_CONFIG_FILE="$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/ext/mcuboot/include/mcuboot-mbedtls-cfg.h>"
+ MBEDTLS_CONFIG_FILE="$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/ext/mcuboot/config/mcuboot-mbedtls-cfg.h>"
# Workaround for https://github.com/ARMmbed/mbedtls/issues/1077
$<$<OR:$<STREQUAL:${CMAKE_SYSTEM_ARCHITECTURE},armv8-m.base>,$<STREQUAL:${CMAKE_SYSTEM_ARCHITECTURE},armv6-m>>:MULADDC_CANNOT_USE_R7>
)
diff --git a/bl2/ext/mcuboot/include/mcuboot-mbedtls-cfg.h b/bl2/ext/mcuboot/config/mcuboot-mbedtls-cfg.h
index 244a34b75..244a34b75 100644
--- a/bl2/ext/mcuboot/include/mcuboot-mbedtls-cfg.h
+++ b/bl2/ext/mcuboot/config/mcuboot-mbedtls-cfg.h