michaelh/zephyr
1
0
Fork 0
Code Releases Activity

mbedtls: kconfig: MBEDTLS_USER_CONFIG_FILE default without a prompt

Browse source 
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 <Torsten.Rasmussen@nordicsemi.no>
Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
This commit is contained in:
Torsten Rasmussen 2021-04-27 10:07:15 +02:00 • committed by Kumar Gala
commit c5097101f3
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/mbedtls/Kconfig.tls-generic
View file

@ -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.