From c5097101f3c26da9cfb448c8047ce4dbdfafbb73 Mon Sep 17 00:00:00 2001 From: Torsten Rasmussen Date: Tue, 27 Apr 2021 10:07:15 +0200 Subject: [PATCH] mbedtls: kconfig: MBEDTLS_USER_CONFIG_FILE default without a prompt This commit removes the prompt from MBEDTLS_USER_CONFIG_FILE unless MBEDTLS_USER_CONFIG_ENABLE is true. This fixes issues where other parts would specify a default value for MBEDTLS_USER_CONFIG_FILE that would become stuck and not updated if user re-configured the system using menuconfig. Disabling the prompt ensures that only when a user specifically enables MBEDTLS_USER_CONFIG_ENABLE and specify a custom user value in MBEDTLS_USER_CONFIG_FILE the setting will be fixed. Also updates the manifest with related change in the mbedtls project. Signed-off-by: Torsten Rasmussen Signed-off-by: Ioannis Glaropoulos --- modules/mbedtls/Kconfig.tls-generic | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/mbedtls/Kconfig.tls-generic b/modules/mbedtls/Kconfig.tls-generic index eb2394d2b84..68966408cdf 100644 --- a/modules/mbedtls/Kconfig.tls-generic +++ b/modules/mbedtls/Kconfig.tls-generic @@ -338,8 +338,7 @@ config MBEDTLS_USER_CONFIG_ENABLE the generic config file. config MBEDTLS_USER_CONFIG_FILE - string "User configuration file for mbedTLS" - depends on MBEDTLS_USER_CONFIG_ENABLE + string "User configuration file for mbed TLS" if MBEDTLS_USER_CONFIG_ENABLE help User config file that can contain mbedTLS configs that were not covered by the generic config file.