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

This commit is contained in:
Simon Butcher 2016-07-11 10:17:03 +01:00 committed by GitHub
parent e012aa3ae2
commit 1d46a2d5aa
2 changed files with 6 additions and 2 deletions

View file

@ -2567,7 +2567,11 @@
/* \} name SECTION: Customisation configuration options */ /* \} name SECTION: Customisation configuration options */
/* Target and application specific configurations */ /* 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. * Allow user to override any previous default.

View file

@ -16,7 +16,7 @@ conf() {
# Set the target specific header # 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 # not supported on mbed OS, nor used by mbed Client
conf unset MBEDTLS_NET_C conf unset MBEDTLS_NET_C