Platform: Rename mbedTLS config file
To prevent name collision the mbedtls_config.h
is renamed to tfm_mbedtls_config.h
Change-Id: I1b5d3dcaae73faaa759252c963ce589fbfb2831b
Signed-off-by: Gabor Kertesz <gabor.kertesz@arm.com>
diff --git a/CommonConfig.cmake b/CommonConfig.cmake
index c0ac875..f0666b0 100755
--- a/CommonConfig.cmake
+++ b/CommonConfig.cmake
@@ -162,7 +162,7 @@
##TF-M storage
config_setting_shared_flags(tfm_storage)
-set(MBEDTLS_C_FLAGS "-D__ARM_FEATURE_CMSE=3 -D__thumb2__ ${COMMON_COMPILE_FLAGS_STR} -DMBEDTLS_CONFIG_FILE=\\\\\\\"mbedtls_config.h\\\\\\\" -I${CMAKE_CURRENT_LIST_DIR}/platform/ext/common")
+set(MBEDTLS_C_FLAGS "-D__ARM_FEATURE_CMSE=3 -D__thumb2__ ${COMMON_COMPILE_FLAGS_STR} -DMBEDTLS_CONFIG_FILE=\\\\\\\"tfm_mbedtls_config.h\\\\\\\" -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
diff --git a/platform/ext/common/mbedtls_config.h b/platform/ext/common/tfm_mbedtls_config.h
similarity index 100%
rename from platform/ext/common/mbedtls_config.h
rename to platform/ext/common/tfm_mbedtls_config.h
diff --git a/platform/ext/readme.md b/platform/ext/readme.md
index 8cd2bce..a4f81c3 100644
--- a/platform/ext/readme.md
+++ b/platform/ext/readme.md
@@ -18,7 +18,7 @@
### common
This folder contains stdout redirection to UART, a temporary memory mapped
-flash implementation for the bootloader and mbedtls_config.h for all
+flash implementation for the bootloader and tfm_mbedtls_config.h for all
the targets.
### drivers
diff --git a/secure_fw/services/secure_storage/crypto/sst_crypto_interface.c b/secure_fw/services/secure_storage/crypto/sst_crypto_interface.c
index 0036b9a..b55113d 100644
--- a/secure_fw/services/secure_storage/crypto/sst_crypto_interface.c
+++ b/secure_fw/services/secure_storage/crypto/sst_crypto_interface.c
@@ -12,7 +12,7 @@
#define LIB_PREFIX_NAME __tfm_storage__
#include "mbedtls_global_symbols.h"
-#define MBEDTLS_CONFIG_FILE "mbedtls_config.h"
+#define MBEDTLS_CONFIG_FILE "tfm_mbedtls_config.h"
#include "mbedtls/gcm.h"
#include "mbedtls/memory_buffer_alloc.h"
#include "platform/include/plat_crypto_keys.h"