From 82fbdec446a2a9493afee329def4a3dbfd48133e Mon Sep 17 00:00:00 2001
From: Simon Butcher <simon.butcher@arm.com>
Date: Thu, 9 Jun 2016 16:41:09 +0100
Subject: [PATCH] Fixes configurations changed by target_config.h removal

---
 core/mbedtls/importer/adjust-config.sh |  2 ++
 core/mbedtls/inc/mbedtls/config.h      | 10 +++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/core/mbedtls/importer/adjust-config.sh b/core/mbedtls/importer/adjust-config.sh
index 7dd1949dc2..660a348eca 100755
--- a/core/mbedtls/importer/adjust-config.sh
+++ b/core/mbedtls/importer/adjust-config.sh
@@ -30,7 +30,9 @@ conf unset MBEDTLS_NET_C
 conf unset MBEDTLS_TIMING_C
 
 # not supported on all targets with mbed OS, nor used by mbed Client
+conf unset MBEDTLS_HAVE_TIME_DATE
 conf unset MBEDTLS_FS_IO
+conf set MBEDTLS_NO_PLATFORM_ENTROPY
 
 conf unset MBEDTLS_CIPHER_MODE_CFB
 conf unset MBEDTLS_CIPHER_MODE_CTR
diff --git a/core/mbedtls/inc/mbedtls/config.h b/core/mbedtls/inc/mbedtls/config.h
index d6a635d9f3..71feaad9cd 100644
--- a/core/mbedtls/inc/mbedtls/config.h
+++ b/core/mbedtls/inc/mbedtls/config.h
@@ -85,7 +85,7 @@
  *
  * Comment if your system does not have a correct clock.
  */
-#define MBEDTLS_HAVE_TIME_DATE
+//#define MBEDTLS_HAVE_TIME_DATE
 
 /**
  * \def MBEDTLS_PLATFORM_MEMORY
@@ -781,7 +781,7 @@
  *
  * Uncomment this macro to disable the built-in platform entropy functions.
  */
-//#define MBEDTLS_NO_PLATFORM_ENTROPY
+#define MBEDTLS_NO_PLATFORM_ENTROPY
 
 /**
  * \def MBEDTLS_ENTROPY_FORCE_SHA256
@@ -2513,11 +2513,7 @@
 /* X509 options */
 //#define MBEDTLS_X509_MAX_INTERMEDIATE_CA   8   /**< Maximum number of intermediate CAs in a verification chain. */
 
-/* \} name SECTION: Module configuration options */
-
-#if defined(TARGET_LIKE_MBED)
-#include "mbedtls/target_config.h"
-#endif
+/* \} name SECTION: Customisation configuration options */
 
 /*
  * Allow user to override any previous default.