Skip to content

Commit

Permalink
config: using CONFIG_MBEDTLS_USER_CONFIG_FILE as safeguard
Browse files Browse the repository at this point in the history
Now using CONFIG_MBEDTLS_USER_CONFIG_FILE instead of
CONFIG_MBEDTLS_USER_CONFIG_ENABLE for inclusion of user config file.

The Kconfig MBEDTLS_USER_CONFIG_ENABLE setting now now determines if
MBEDTLS_USER_CONFIG_FILE is visible.

This removes the problem of MBEDTLS_USER_CONFIG_FILE to be stuck on its
first value.

Users can use MBEDTLS_USER_CONFIG_ENABLE to get the prompt and define
their own value.

As the CONFIG_MBEDTLS_USER_CONFIG_FILE is default promptless then we can
use this setting directly as it will only be defined if another Kconfig
file specifies a default value to use, or user enables:
MBEDTLS_USER_CONFIG_ENABLE.

Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Ioannis Glaropoulos <[email protected]>
  • Loading branch information
ioannisg authored and galak committed May 9, 2021
1 parent 5888428 commit 81e9ea5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion modules/mbedtls/configs/config-tls-generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@

/* User config file */

#if defined(CONFIG_MBEDTLS_USER_CONFIG_ENABLE)
#if defined(CONFIG_MBEDTLS_USER_CONFIG_FILE)
#include CONFIG_MBEDTLS_USER_CONFIG_FILE
#endif

Expand Down

0 comments on commit 81e9ea5

Please sign in to comment.