Move MBEDTLS_VERSION_* back to mbedtls_config.h

We will add TF-PSA-Crypto specific ones when
we add support for querying version and version
features in TF-PSA-Crypto.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>
diff --git a/docs/proposed/config-split.md b/docs/proposed/config-split.md
index f4d7bda..3713c2c 100644
--- a/docs/proposed/config-split.md
+++ b/docs/proposed/config-split.md
@@ -148,8 +148,6 @@
 //#define MBEDTLS_TEST_CONSTANT_FLOW_MEMSAN
 //#define MBEDTLS_TEST_CONSTANT_FLOW_VALGRIND
 //#define MBEDTLS_TEST_HOOKS
-#define MBEDTLS_VERSION_C
-#define MBEDTLS_VERSION_FEATURES
 
 //#define MBEDTLS_CHECK_RETURN __attribute__((__warn_unused_result__))
 //#define MBEDTLS_IGNORE_RETURN( result ) ((void) !(result))
@@ -362,6 +360,8 @@
 #define MBEDTLS_SSL_SERVER_NAME_INDICATION
 //#define MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH
 //#define MBEDTLS_USE_PSA_CRYPTO
+#define MBEDTLS_VERSION_C
+#define MBEDTLS_VERSION_FEATURES
 //#define MBEDTLS_X509_TRUSTED_CERTIFICATE_CALLBACK
 //#define MBEDTLS_X509_REMOVE_INFO
 #define MBEDTLS_X509_RSASSA_PSS_SUPPORT