commit 1bb168e999a2236984a0d845dde09ad71c1ca650
author Raef Coles <raef.coles@arm.com> Thu Oct 17 09:04:55 2019 +0100
committer David Vincze <david.vincze@arm.com> Fri Nov 29 16:35:10 2019 +0100
tree c985949fa9144f9befc6deefe5cddfae9ac97b0a
parent e1570bd143ef4843a531b57f77f0c2814b075dd9

Boot: Switch boot to use mbed-crypto

Replace the dependency on mbedtls with the version of mbedtls packaged
with mbed-crypto.

Change-Id: I17a68f904c9cd68085ecb4432a7a10d6b64494a1
Signed-off-by: Raef Coles <raef.coles@arm.com>

CommonConfig.cmake

diff --git a/CommonConfig.cmake b/CommonConfig.cmake
index d159c4c..bae73af 100644
--- a/CommonConfig.cmake
+++ b/CommonConfig.cmake
@@ -307,8 +307,8 @@
 	endif()
 endif()
 
-##Set Mbed TLS compiler flags and variables for audit log and crypto
-set(MBEDTLS_C_FLAGS_SERVICES "-D__ARM_FEATURE_CMSE=${ARM_FEATURE_CMSE} -D__thumb2__ ${COMMON_COMPILE_FLAGS_STR} -I${CMAKE_CURRENT_LIST_DIR}/platform/ext/common")
+##Set Mbed Crypto compiler flags and variables for crypto service
+set(MBEDCRYPTO_C_FLAGS_SERVICES "-D__ARM_FEATURE_CMSE=${ARM_FEATURE_CMSE} -D__thumb2__ ${COMMON_COMPILE_FLAGS_STR} -I${CMAKE_CURRENT_LIST_DIR}/platform/ext/common")
 
 #Default TF-M secure storage flags.
 #These flags values can be overwritten by setting them in platform/ext/<TARGET_NAME>.cmake
@@ -369,8 +369,8 @@
 	endif()
 endif()
 
-if (NOT DEFINED MBEDTLS_DEBUG)
-	set(MBEDTLS_DEBUG OFF)
+if (NOT DEFINED MBEDCRYPTO_DEBUG)
+	set(MBEDCRYPTO_DEBUG OFF)
 endif()
 
 #Default TF-M initial-attestation service flags.
@@ -390,7 +390,7 @@
 validate_cache_value(ATTEST_BOOT_INTERFACE)
 
 ##Set mbedTLS compiler flags for BL2 bootloader
-set(MBEDTLS_C_FLAGS_BL2 "-D__ARM_FEATURE_CMSE=${ARM_FEATURE_CMSE} -D__thumb2__ ${COMMON_COMPILE_FLAGS_STR} -DMBEDTLS_CONFIG_FILE=\\\\\\\"config-boot.h\\\\\\\" -I${CMAKE_CURRENT_LIST_DIR}/bl2/ext/mcuboot/include")
+set(MBEDCRYPTO_C_FLAGS_BL2 "-D__ARM_FEATURE_CMSE=${ARM_FEATURE_CMSE} -D__thumb2__ ${COMMON_COMPILE_FLAGS_STR} -DMBEDTLS_CONFIG_FILE=\\\\\\\"config-boot.h\\\\\\\" -I${CMAKE_CURRENT_LIST_DIR}/bl2/ext/mcuboot/include")
 if (MCUBOOT_SIGNATURE_TYPE STREQUAL "RSA-3072")
-	string(APPEND MBEDTLS_C_FLAGS_BL2 " -DMCUBOOT_SIGN_RSA_LEN=3072")
+	string(APPEND MBEDCRYPTO_C_FLAGS_BL2 " -DMCUBOOT_SIGN_RSA_LEN=3072")
 endif()