Kconfig: Clean up some symbol definitions

- Remove redundant 'n' defaults. 'n' is the default value for bool
  symbols.

  This makes the auto-generated documentation clearer as well: You get
  "implicitly defaults to n" instead of
  "- n if <propagated dependencies>".

- Shorten

      <type>
      prompt "foo"

  to

      <type> "foo"

  This works for all types, not just bool.

- Various formatting nits.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
This commit is contained in:
Ulf Magnusson 2018-08-01 17:19:57 +02:00 committed by Anas Nashif
parent 3a2572625e
commit d1684a83a4
15 changed files with 20 additions and 83 deletions

View file

@ -200,7 +200,7 @@ config IA32_LEGACY_IO_PORTS
than memory access, so they should be used in last resort. than memory access, so they should be used in last resort.
config CMOV config CMOV
def_bool n bool
help help
This option signifies the use of an Intel CPU that supports This option signifies the use of an Intel CPU that supports
the CMOV instruction. the CMOV instruction.

View file

@ -87,7 +87,6 @@ if BT_SPI
config BT_BLUENRG_ACI config BT_BLUENRG_ACI
bool "Enable ACI message with with BlueNRG-based devices" bool "Enable ACI message with with BlueNRG-based devices"
default n
help help
Enable support for devices compatible with the BlueNRG Bluetooth Enable support for devices compatible with the BlueNRG Bluetooth
Stack. Current driver supports: ST BLUENRG-MS. Stack. Current driver supports: ST BLUENRG-MS.

View file

@ -42,7 +42,6 @@ config ETH_NATIVE_POSIX_DEV_NAME
config ETH_NATIVE_POSIX_PTP_CLOCK config ETH_NATIVE_POSIX_PTP_CLOCK
bool "PTP clock driver support" bool "PTP clock driver support"
default n
select PTP_CLOCK select PTP_CLOCK
depends on NET_GPTP depends on NET_GPTP
help help

View file

@ -12,7 +12,6 @@
menuconfig I2C_SLAVE menuconfig I2C_SLAVE
bool "I2C Slave Drivers" bool "I2C Slave Drivers"
depends on I2C depends on I2C
default n
help help
Enable I2C Slave Driver Configuration Enable I2C Slave Driver Configuration

View file

@ -9,7 +9,6 @@
config I2C_EEPROM_SLAVE config I2C_EEPROM_SLAVE
bool "I2C Slave EEPROM driver" bool "I2C Slave EEPROM driver"
depends on I2C_SLAVE depends on I2C_SLAVE
default n
help help
Enable virtual I2C Slave EEPROM driver Enable virtual I2C Slave EEPROM driver
@ -41,7 +40,6 @@ config I2C_EEPROM_SLAVE_0_ADDRESS
config I2C_EEPROM_SLAVE_1 config I2C_EEPROM_SLAVE_1
bool "Enable I2C Slave EEPROM driver instance 1" bool "Enable I2C Slave EEPROM driver instance 1"
depends on I2C_EEPROM_SLAVE depends on I2C_EEPROM_SLAVE
default n
config I2C_EEPROM_SLAVE_1_SIZE config I2C_EEPROM_SLAVE_1_SIZE
int "I2C Slave EEPROM 1 Size in KiB" int "I2C Slave EEPROM 1 Size in KiB"

View file

@ -7,7 +7,6 @@
menuconfig PCA9633 menuconfig PCA9633
bool "PCA9633 LED driver" bool "PCA9633 LED driver"
depends on I2C depends on I2C
default n
help help
Enable LED driver for PCA9633. Enable LED driver for PCA9633.

View file

@ -50,7 +50,6 @@ endif # UART_GECKO_1
menuconfig USART_GECKO_0 menuconfig USART_GECKO_0
bool "USART 0" bool "USART 0"
default n
help help
Enable USART 0. Enable USART 0.
@ -67,7 +66,6 @@ endif # USART_GECKO_0
menuconfig USART_GECKO_1 menuconfig USART_GECKO_1
bool "USART 1" bool "USART 1"
default n
help help
Enable USART 1. Enable USART 1.

View file

@ -15,13 +15,11 @@ config TLS_VERSION_1_0
bool "Enable support for TLS 1.0" bool "Enable support for TLS 1.0"
select TLS_MAC_MD5_ENABLED select TLS_MAC_MD5_ENABLED
select TLS_MAC_SHA1_ENABLED select TLS_MAC_SHA1_ENABLED
default n
config TLS_VERSION_1_1 config TLS_VERSION_1_1
bool "Enable support for TLS 1.1 (DTLS 1.0)" bool "Enable support for TLS 1.1 (DTLS 1.0)"
select TLS_MAC_MD5_ENABLED select TLS_MAC_MD5_ENABLED
select TLS_MAC_SHA1_ENABLED select TLS_MAC_SHA1_ENABLED
default n
config TLS_VERSION_1_2 config TLS_VERSION_1_2
bool "Enable support for TLS 1.2 (DTLS 1.2)" bool "Enable support for TLS 1.2 (DTLS 1.2)"
@ -30,7 +28,6 @@ config TLS_VERSION_1_2
config TLS_DTLS config TLS_DTLS
bool "Enable support for DTLS" bool "Enable support for DTLS"
depends on TLS_VERSION_1_1 || TLS_VERSION_1_2 depends on TLS_VERSION_1_1 || TLS_VERSION_1_2
default n
endmenu endmenu
@ -40,19 +37,15 @@ comment "Supported key exchange modes"
config TLS_KEY_EXCHANGE_PSK_ENABLED config TLS_KEY_EXCHANGE_PSK_ENABLED
bool "Enable the PSK based ciphersuite modes" bool "Enable the PSK based ciphersuite modes"
default n
config TLS_KEY_EXCHANGE_DHE_PSK_ENABLED config TLS_KEY_EXCHANGE_DHE_PSK_ENABLED
bool "Enable the DHE-PSK based ciphersuite modes" bool "Enable the DHE-PSK based ciphersuite modes"
default n
config TLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED config TLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
bool "Enable the ECDHE-PSK based ciphersuite modes" bool "Enable the ECDHE-PSK based ciphersuite modes"
default n
config TLS_KEY_EXCHANGE_RSA_PSK_ENABLED config TLS_KEY_EXCHANGE_RSA_PSK_ENABLED
bool "Enable the RSA-PSK based ciphersuite modes" bool "Enable the RSA-PSK based ciphersuite modes"
default n
config TLS_KEY_EXCHANGE_RSA_ENABLED config TLS_KEY_EXCHANGE_RSA_ENABLED
bool "Enable the RSA-only based ciphersuite modes" bool "Enable the RSA-only based ciphersuite modes"
@ -60,92 +53,72 @@ config TLS_KEY_EXCHANGE_RSA_ENABLED
config TLS_KEY_EXCHANGE_DHE_RSA_ENABLED config TLS_KEY_EXCHANGE_DHE_RSA_ENABLED
bool "Enable the DHE-RSA based ciphersuite modes" bool "Enable the DHE-RSA based ciphersuite modes"
default n
config TLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED config TLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
bool "Enable the ECDHE-RSA based ciphersuite modes" bool "Enable the ECDHE-RSA based ciphersuite modes"
default n
config TLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED config TLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
bool "Enable the ECDHE-ECDSA based ciphersuite modes" bool "Enable the ECDHE-ECDSA based ciphersuite modes"
default n
config TLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED config TLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
bool "Enable the ECDH-ECDSA based ciphersuite modes" bool "Enable the ECDH-ECDSA based ciphersuite modes"
default n
config TLS_KEY_EXCHANGE_ECDH_RSA_ENABLED config TLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
bool "Enable the ECDH-RSA based ciphersuite modes" bool "Enable the ECDH-RSA based ciphersuite modes"
default n
config TLS_KEY_EXCHANGE_ECJPAKE_ENABLED config TLS_KEY_EXCHANGE_ECJPAKE_ENABLED
bool "Enable the ECJPAKE based ciphersuite modes" bool "Enable the ECJPAKE based ciphersuite modes"
default n
if TLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED || \ if TLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED || \
TLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED || \ TLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED || \
TLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED || \ TLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED || \
TLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED || \ TLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED || \
TLS_KEY_EXCHANGE_ECDH_RSA_ENABLED || \ TLS_KEY_EXCHANGE_ECDH_RSA_ENABLED || \
TLS_KEY_EXCHANGE_ECJPAKE_ENABLED \ TLS_KEY_EXCHANGE_ECJPAKE_ENABLED
comment "Supported elliptic curves" comment "Supported elliptic curves"
config TLS_ECP_DP_SECP192R1_ENABLED config TLS_ECP_DP_SECP192R1_ENABLED
bool "Enable SECP192R1 elliptic curve" bool "Enable SECP192R1 elliptic curve"
default n
config TLS_ECP_DP_SECP224R1_ENABLED config TLS_ECP_DP_SECP224R1_ENABLED
bool "Enable SECP224R1 elliptic curve" bool "Enable SECP224R1 elliptic curve"
default n
config TLS_ECP_DP_SECP256R1_ENABLED config TLS_ECP_DP_SECP256R1_ENABLED
bool "Enable SECP256R1 elliptic curve" bool "Enable SECP256R1 elliptic curve"
default n
config TLS_ECP_DP_SECP384R1_ENABLED config TLS_ECP_DP_SECP384R1_ENABLED
bool "Enable SECP384R1 elliptic curve" bool "Enable SECP384R1 elliptic curve"
default n
config TLS_ECP_DP_SECP521R1_ENABLED config TLS_ECP_DP_SECP521R1_ENABLED
bool "Enable SECP521R1 elliptic curve" bool "Enable SECP521R1 elliptic curve"
default n
config TLS_ECP_DP_SECP192K1_ENABLED config TLS_ECP_DP_SECP192K1_ENABLED
bool "Enable SECP192K1 elliptic curve" bool "Enable SECP192K1 elliptic curve"
default n
config TLS_ECP_DP_SECP224K1_ENABLED config TLS_ECP_DP_SECP224K1_ENABLED
bool "Enable SECP224K1 elliptic curve" bool "Enable SECP224K1 elliptic curve"
default n
config TLS_ECP_DP_SECP256K1_ENABLED config TLS_ECP_DP_SECP256K1_ENABLED
bool "Enable SECP256K1 elliptic curve" bool "Enable SECP256K1 elliptic curve"
default n
config TLS_ECP_DP_BP256R1_ENABLED config TLS_ECP_DP_BP256R1_ENABLED
bool "Enable BP256R1 elliptic curve" bool "Enable BP256R1 elliptic curve"
default n
config TLS_ECP_DP_BP384R1_ENABLED config TLS_ECP_DP_BP384R1_ENABLED
bool "Enable BP384R1 elliptic curve" bool "Enable BP384R1 elliptic curve"
default n
config TLS_ECP_DP_BP512R1_ENABLED config TLS_ECP_DP_BP512R1_ENABLED
bool "Enable BP512R1 elliptic curve" bool "Enable BP512R1 elliptic curve"
default n
config TLS_ECP_DP_CURVE25519_ENABLED config TLS_ECP_DP_CURVE25519_ENABLED
bool "Enable CURVE25519 elliptic curve" bool "Enable CURVE25519 elliptic curve"
default n
config TLS_ECP_DP_CURVE448_ENABLED config TLS_ECP_DP_CURVE448_ENABLED
bool "Enable CURVE448 elliptic curve" bool "Enable CURVE448 elliptic curve"
default n
config TLS_ECP_NIST_OPTIM config TLS_ECP_NIST_OPTIM
bool "Enable NSIT curves optimization" bool "Enable NSIT curves optimization"
default n
endif endif
@ -157,7 +130,6 @@ config TLS_CIPHER_AES_ENABLED
config TLS_CIPHER_CAMELLIA_ENABLED config TLS_CIPHER_CAMELLIA_ENABLED
bool "Enable the Camellia block cipher" bool "Enable the Camellia block cipher"
default n
config TLS_CIPHER_DES_ENABLED config TLS_CIPHER_DES_ENABLED
bool "Enable the DES block cipher" bool "Enable the DES block cipher"
@ -165,7 +137,6 @@ config TLS_CIPHER_DES_ENABLED
config TLS_CIPHER_CCM_ENABLED config TLS_CIPHER_CCM_ENABLED
bool "Enable the Counter with CBC-MAC (CCM) mode for 128-bit block cipher" bool "Enable the Counter with CBC-MAC (CCM) mode for 128-bit block cipher"
default n
depends on TLS_CIPHER_AES_ENABLED || TLS_CIPHER_CAMELLIA_ENABLED depends on TLS_CIPHER_AES_ENABLED || TLS_CIPHER_CAMELLIA_ENABLED
config TLS_CIPHER_CBC_ENABLED config TLS_CIPHER_CBC_ENABLED
@ -188,20 +159,17 @@ config TLS_MAC_SHA256_ENABLED
config TLS_MAC_SHA512_ENABLED config TLS_MAC_SHA512_ENABLED
bool "Enable the SHA-384 and SHA-512 hash algorithms" bool "Enable the SHA-384 and SHA-512 hash algorithms"
default n
endmenu endmenu
config TLS_PEM_CERTIFICATE_FORMAT config TLS_PEM_CERTIFICATE_FORMAT
bool "Enable support for PEM certificate format" bool "Enable support for PEM certificate format"
default n
help help
By default only DER (binary) format of certificates is supported. Enable By default only DER (binary) format of certificates is supported. Enable
this option to enable support for PEM format. this option to enable support for PEM format.
config TLS_USER_CONFIG_ENABLE config TLS_USER_CONFIG_ENABLE
bool "Enable user mbedTLS config file" bool "Enable user mbedTLS config file"
default n
help help
Enable user mbedTLS config file that will be included at the end of Enable user mbedTLS config file that will be included at the end of
the generic config file. the generic config file.
@ -209,7 +177,6 @@ config TLS_USER_CONFIG_ENABLE
config TLS_USER_CONFIG_FILE config TLS_USER_CONFIG_FILE
string "User configuration file for mbedTLS" string "User configuration file for mbedTLS"
depends on TLS_USER_CONFIG_ENABLE depends on TLS_USER_CONFIG_ENABLE
default ""
help help
User config file that can contain mbedTLS configs that were not User config file that can contain mbedTLS configs that were not
covered by the generic config file. covered by the generic config file.

View file

@ -56,8 +56,7 @@ config TEXT_SECTION_OFFSET
may require smaller or larger values. may require smaller or larger values.
config HAVE_CUSTOM_LINKER_SCRIPT config HAVE_CUSTOM_LINKER_SCRIPT
prompt "Custom linker scripts provided" bool "Custom linker scripts provided"
def_bool n
help help
Set this option if you have a custom linker script which needed to Set this option if you have a custom linker script which needed to
be define in CUSTOM_LINKER_SCRIPT. be define in CUSTOM_LINKER_SCRIPT.
@ -251,7 +250,6 @@ config BUILD_OUTPUT_STRIPPED
config APPLICATION_DEFINED_SYSCALL config APPLICATION_DEFINED_SYSCALL
bool "Scan application folder for any syscall definition" bool "Scan application folder for any syscall definition"
default n
help help
Scan additional folders inside application source folder Scan additional folders inside application source folder
for application defined syscalls. for application defined syscalls.
@ -346,9 +344,7 @@ config BOOTLOADER_MCUBOOT
Tree in order to place and link the image at the slot0 offset Tree in order to place and link the image at the slot0 offset
config BOOTLOADER_ESP_IDF config BOOTLOADER_ESP_IDF
bool bool "ESP-IDF bootloader support"
prompt "ESP-IDF bootloader support"
default n
depends on SOC_ESP32 depends on SOC_ESP32
help help
This option will trigger the compilation of the ESP-IDF booloader This option will trigger the compilation of the ESP-IDF booloader
@ -356,9 +352,7 @@ config BOOTLOADER_ESP_IDF
At flash time, the bootloader will be flashed with the zephyr image At flash time, the bootloader will be flashed with the zephyr image
config REALMODE config REALMODE
bool bool "boot from x86 real mode"
prompt "boot from x86 real mode"
default n
depends on X86 depends on X86
help help
This option enabled Zephyr to start in x86 real mode, instead of This option enabled Zephyr to start in x86 real mode, instead of

View file

@ -1,9 +1,8 @@
menu "General Kernel Options" menu "General Kernel Options"
config APP_SHARED_MEM config APP_SHARED_MEM
bool bool "Application shared memory with app_memory"
prompt "Application shared memory with app_memory"
default n
help help
This is a wrapper around app_memory to simplify usage. This is a wrapper around app_memory to simplify usage.
endmenu endmenu

View file

@ -44,8 +44,7 @@ config NET_DHCPV4
config NET_IPV4_AUTO config NET_IPV4_AUTO
bool "Enable IPv4 autoconfiguration [EXPERIMENTAL]" bool "Enable IPv4 autoconfiguration [EXPERIMENTAL]"
depends on NET_IPV4 && NET_ARP depends on NET_IPV4 && NET_ARP
default n help
help
Enables IPv4 auto IP address configuration (see RFC 3927) Enables IPv4 auto IP address configuration (see RFC 3927)
if NET_LOG if NET_LOG
@ -69,7 +68,6 @@ config NET_DEBUG_DHCPV4
config NET_DEBUG_IPV4_AUTOCONF config NET_DEBUG_IPV4_AUTOCONF
bool "Debug IPv4 autoconf client" bool "Debug IPv4 autoconf client"
depends on NET_IPV4_AUTO depends on NET_IPV4_AUTO
default n
help help
Enable debug diagnostic from IPv4 autoconf client. Enable debug diagnostic from IPv4 autoconf client.

View file

@ -24,15 +24,13 @@ config NET_SOCKETS_POSIX_NAMES
option enabled, it will still apply only to sockets. option enabled, it will still apply only to sockets.
config NET_SOCKETS_POLL_MAX config NET_SOCKETS_POLL_MAX
int int "Max number of supported poll() entries"
prompt "Max number of supported poll() entries"
default 3 default 3
help help
Maximum number of entries supported for poll() call. Maximum number of entries supported for poll() call.
config NET_SOCKETS_SOCKOPT_TLS config NET_SOCKETS_SOCKOPT_TLS
bool "Enable TCP TLS socket option support [EXPERIMENTAL]" bool "Enable TCP TLS socket option support [EXPERIMENTAL]"
default n
select TLS_CREDENTIALS select TLS_CREDENTIALS
help help
Enable TLS socket option support which automatically establishes Enable TLS socket option support which automatically establishes

View file

@ -6,7 +6,6 @@
menuconfig TLS_CREDENTIALS menuconfig TLS_CREDENTIALS
bool "TLS credentials management" bool "TLS credentials management"
default n
help help
Enable TLS credentials management subsystem. Enable TLS credentials management subsystem.

View file

@ -15,8 +15,7 @@ menuconfig USB_DEVICE_STACK
if USB_DEVICE_STACK if USB_DEVICE_STACK
config SYS_LOG_USB_DEVICE_LEVEL config SYS_LOG_USB_DEVICE_LEVEL
int int "Sets log level for the USB device stack"
prompt "Sets log level for the USB device stack"
default 0 default 0
depends on SYS_LOG depends on SYS_LOG
help help
@ -35,36 +34,31 @@ config SYS_LOG_USB_DEVICE_LEVEL
- 4 DEBUG, write SYS_LOG_DBG in addition to previous levels - 4 DEBUG, write SYS_LOG_DBG in addition to previous levels
config USB_DEVICE_VID config USB_DEVICE_VID
hex hex "USB Vendor ID"
prompt "USB Vendor ID"
default 0x2FE3 default 0x2FE3
help help
USB device vendor ID. MUST be configured by vendor. USB device vendor ID. MUST be configured by vendor.
config USB_DEVICE_PID config USB_DEVICE_PID
hex hex "USB Product ID"
prompt "USB Product ID"
default 0x100 default 0x100
help help
USB device product ID. MUST be configured by vendor. USB device product ID. MUST be configured by vendor.
config USB_DEVICE_MANUFACTURER config USB_DEVICE_MANUFACTURER
string string "USB manufacturer name"
prompt "USB manufacturer name"
default "ZEPHYR" default "ZEPHYR"
help help
USB device Manufacturer string. MUST be configured by vendor. USB device Manufacturer string. MUST be configured by vendor.
config USB_DEVICE_PRODUCT config USB_DEVICE_PRODUCT
string string "USB product name"
prompt "USB product name"
default "USB-DEV" default "USB-DEV"
help help
USB device Product string. MUST be configured by vendor. USB device Product string. MUST be configured by vendor.
config USB_DEVICE_SN config USB_DEVICE_SN
string string "USB serial number"
prompt "USB serial number"
default "0.01" default "0.01"
help help
USB device SerialNumber string. MUST be configured by vendor. USB device SerialNumber string. MUST be configured by vendor.
@ -76,8 +70,7 @@ config USB_COMPOSITE_DEVICE
Enable composite USB device driver. Enable composite USB device driver.
config USB_COMPOSITE_BUFFER_SIZE config USB_COMPOSITE_BUFFER_SIZE
int int "Set buffer size for Class Handler"
prompt "Set buffer size for Class Handler"
depends on USB_COMPOSITE_DEVICE depends on USB_COMPOSITE_DEVICE
default 64 default 64
default 256 if USB_DEVICE_NETWORK_RNDIS default 256 if USB_DEVICE_NETWORK_RNDIS
@ -86,9 +79,7 @@ config USB_DEVICE_BOS
bool "Enable USB Binary Device Object Store (BOS)" bool "Enable USB Binary Device Object Store (BOS)"
config USB_DEVICE_OS_DESC config USB_DEVICE_OS_DESC
bool bool "Enable MS OS Descriptors support"
prompt "Enable MS OS Descriptors support"
default n
source "subsys/usb/class/Kconfig" source "subsys/usb/class/Kconfig"

View file

@ -9,12 +9,11 @@
config I2C_VIRTUAL config I2C_VIRTUAL
bool "Virtual I2C Driver for Slave development" bool "Virtual I2C Driver for Slave development"
depends on I2C depends on I2C
default n
help help
This driver exposes a virtual I2C driver used to debug virtual This driver exposes a virtual I2C driver used to debug virtual
I2C slave drivers. I2C slave drivers.
config I2C_VIRTUAL_NAME config I2C_VIRTUAL_NAME
string "Virtual Port device name" string "Virtual Port device name"
depends on I2C_VIRTUAL
default "I2C_VIRTUAL" default "I2C_VIRTUAL"
depends on I2C_VIRTUAL