Skip to content

Commit 39c9177

Browse files
ioannisggalak
authored andcommitted
Revert "mbedtls: kconfig: created MBEDTLS_PROMPTLESS and CUSTOM_MBEDTLS_CFG_FILE"
This reverts commit 1ad1acd. Signed-off-by: Ioannis Glaropoulos <[email protected]>
1 parent 505b030 commit 39c9177

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

modules/Kconfig.mbedtls

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,8 @@
33
# Copyright (c) 2016 Intel Corporation
44
# SPDX-License-Identifier: Apache-2.0
55

6-
config MBEDTLS_PROMPTLESS
7-
bool
8-
help
9-
Symbol to disable the prompt for MBEDTLS selection.
10-
This symbol may be used internally in a Kconfig tree to hide the
11-
mbed TLS menu prompt and instead handle the selection of MBEDTLS from
12-
dependent sub-configurations and thus preven stuck symbol behavior.
13-
14-
156
menuconfig MBEDTLS
16-
bool "mbed TLS Support" if !MBEDTLS_PROMPTLESS
7+
bool "mbedTLS Support"
178
help
189
This option enables the mbedTLS cryptography library.
1910

@@ -38,15 +29,8 @@ config MBEDTLS_LIBRARY
3829

3930
endchoice
4031

41-
config CUSTOM_MBEDTLS_CFG_FILE
42-
bool "Custom mbed TLS configuration file"
43-
help
44-
Allow user defined input for the MBEDTLS_CFG_FILE setting.
45-
You can specify the actual configuration file using the
46-
MBEDTLS_CFG_FILE setting.
47-
4832
config MBEDTLS_CFG_FILE
49-
string "mbed TLS configuration file" if CUSTOM_MBEDTLS_CFG_FILE
33+
string "mbed TLS configuration file"
5034
depends on MBEDTLS_BUILTIN
5135
default "config-tls-generic.h"
5236
help

samples/drivers/crypto/prj_mtls_shim.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ CONFIG_LOG_MODE_MINIMAL=y
33
CONFIG_MBEDTLS=y
44
CONFIG_MBEDTLS_BUILTIN=y
55
CONFIG_MBEDTLS_CFG_FILE="config-tls-generic.h"
6-
CONFIG_CUSTOM_MBEDTLS_CFG_FILE=y
76
CONFIG_MBEDTLS_HEAP_SIZE=512
87
CONFIG_MBEDTLS_CIPHER_CCM_ENABLED=y
98
CONFIG_MBEDTLS_CIPHER_GCM_ENABLED=y

0 commit comments

Comments
 (0)