commit 1d46a2d5aaf90e53f9e2f6e58df2b129e41f0cd7
author Simon Butcher <simon.butcher@arm.com> Mon Jul 11 10:17:03 2016 +0100
committer GitHub <noreply@github.com> Mon Jul 11 10:17:03 2016 +0100
tree 71b79bd0b8902e81bcfba7ecd32a91b923371d89
parent e012aa3ae2471f6e742a09ca44aa609acffa7e52

Fix issue with reuse of custom yotta configs for target_config.h (#530)

include/mbedtls/config.h

diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index 3b7c85b..8e263b0 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -2567,7 +2567,11 @@
 /* \} name SECTION: Customisation configuration options */
 
 /* Target and application specific configurations */
-//#define YOTTA_CFG_MBEDTLS_USER_CONFIG_FILE "target_config.h"
+//#define YOTTA_CFG_MBEDTLS_TARGET_CONFIG_FILE "mbedtls/target_config.h"
+
+#if defined(TARGET_LIKE_MBED) && defined(YOTTA_CFG_MBEDTLS_TARGET_CONFIG_FILE)
+#include YOTTA_CFG_MBEDTLS_TARGET_CONFIG_FILE
+#endif
 
 /*
  * Allow user to override any previous default.

yotta/data/adjust-config.sh

diff --git a/yotta/data/adjust-config.sh b/yotta/data/adjust-config.sh
index 6580c09..3fa8490 100755
--- a/yotta/data/adjust-config.sh
+++ b/yotta/data/adjust-config.sh
@@ -16,7 +16,7 @@
 
 
 # Set the target specific header
-conf set YOTTA_CFG_MBEDTLS_USER_CONFIG_FILE \"target_config.h\"
+conf set YOTTA_CFG_MBEDTLS_TARGET_CONFIG_FILE \"mbedtls/target_config.h\"
 
 # not supported on mbed OS, nor used by mbed Client
 conf unset MBEDTLS_NET_C