Skip to content

Commit

Permalink
kconfig: tweak Kconfig prompts
Browse files Browse the repository at this point in the history
Tweak some Kconfig prompts after the removal of "Enable...".

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
  • Loading branch information
gmarull authored and carlescufi committed Mar 9, 2022
1 parent 95fb0de commit dffaf53
Show file tree
Hide file tree
Showing 19 changed files with 59 additions and 59 deletions.
4 changes: 2 additions & 2 deletions Kconfig.zephyr
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ config SRAM_OFFSET
menu "Linker Sections"

config LINKER_USE_BOOT_SECTION
bool "Usage of Boot Linker Section"
bool "Use Boot Linker Section"
help
If enabled, the symbols which are needed for the boot process
will be put into another linker section reserved for these
Expand All @@ -231,7 +231,7 @@ config LINKER_USE_BOOT_SECTION
board or custom linker script.

config LINKER_USE_PINNED_SECTION
bool "Usage of Pinned Linker Section"
bool "Use Pinned Linker Section"
help
If enabled, the symbols which need to be pinned in memory
will be put into another linker section reserved for pinned
Expand Down
2 changes: 1 addition & 1 deletion arch/arc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ menu "ARC MPU Options"
depends on CPU_HAS_MPU

config ARC_MPU_ENABLE
bool "MPU"
bool "Memory Protection Unit (MPU)"
select ARC_MPU
help
Enable MPU
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/core/aarch32/cortex_m/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ config SW_VECTOR_RELAY_CLIENT
initialization.

config CORTEX_M_DWT
bool "And use the DWT"
bool "Data Watchpoint and Trace (DWT)"
depends on CPU_CORTEX_M_HAS_DWT
default y if TIMING_FUNCTIONS
help
Expand All @@ -345,7 +345,7 @@ endmenu
# Trace Unit and the Debug Monitor Exception, or the Memory Protection Unit.

choice NULL_POINTER_EXCEPTION_DETECTION
bool "And use null-pointer exception"
bool "Null-pointer exception"
# Disable this until https://github.com/zephyrproject-rtos/zephyr/issues/32984 is fixed
# default NULL_POINTER_EXCEPTION_DETECTION_DWT if TEST_ARM_CORTEX_M && !ARM_NONSECURE_FIRMWARE && CPU_CORTEX_M_HAS_DWT
default NULL_POINTER_EXCEPTION_DETECTION_MPU if TEST_ARM_CORTEX_M && !ARM_NONSECURE_FIRMWARE && ARM_MPU && !CPU_CORTEX_M_HAS_DWT
Expand All @@ -358,7 +358,7 @@ choice NULL_POINTER_EXCEPTION_DETECTION
is enabled and the DWT-based solution is preferred.

config NULL_POINTER_EXCEPTION_DETECTION_NONE
bool "Do not enable null pointer exception detection"
bool "No null pointer exception detection"
help
Null pointer exception detection feature is not
enabled.
Expand Down
4 changes: 2 additions & 2 deletions drivers/ethernet/Kconfig.stm32_hal
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,14 @@ config ETH_STM32_AUTO_NEGOTIATION_ENABLE
if !ETH_STM32_AUTO_NEGOTIATION_ENABLE

config ETH_STM32_SPEED_10M
bool "This if using 10 Mbps for speed when autonegotiation is diabled"
bool "Set speed to 10 Mbps when autonegotiation is diabled"
default n
help
Set this if using 10 Mbps and when autonegotiation is disabled, otherwise speed
is 100 Mbps

config ETH_STM32_MODE_HALFDUPLEX
bool "This if using half duplex"
bool "Half duplex mode"
default n
help
Set this if using half duplex when autonegotiation is disabled otherwise
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2s/Kconfig.stm32
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ config I2S_STM32_TX_BLOCK_COUNT
default 4

config I2S_STM32_USE_PLLI2S_ENABLE
bool "Usage of PLL"
bool "Use PLL"
help
Enable it if I2S clock should be provided by the PLLI2S.
If not enabled the clock will be provided by HSI/HSE.
Expand Down
6 changes: 3 additions & 3 deletions drivers/ieee802154/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ menuconfig IEEE802154
if IEEE802154

config IEEE802154_NET_IF_NO_AUTO_START
bool "Disable 802.15.4 interface auto-start"
bool "IEEE 802.15.4 interface without auto-start"
help
This option allows user to set any configuration and/or filter before
the radio becomes operational. For instance, the EUI-64 value can be
Expand All @@ -26,7 +26,7 @@ config IEEE802154_NET_IF_NO_AUTO_START
have any doubt about this option leave it as default value.

config IEEE802154_RAW_MODE
bool "Use IEEE 802.15.4 driver without the MAC stack"
bool "IEEE 802.15.4 driver without the MAC stack"
select NET_RAW_MODE
help
This option enables using the drivers in a so-called "raw" mode,
Expand All @@ -40,7 +40,7 @@ config IEEE802154_RDEV
PHY is a ranging-capable device (RDEV)

config IEEE802154_VENDOR_OUI_ENABLE
bool "Setting Vendor Organizationally Unique Identifier"
bool "Support setting Vendor Organizationally Unique Identifier"
help
This option enables setting custom vendor
OUI using IEEE802154_VENDOR_OUI. After enabling,
Expand Down
2 changes: 1 addition & 1 deletion drivers/ieee802154/Kconfig.nrf5
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ config IEEE802154_NRF5_EXT_IRQ_MGMT
a radio arbiter used in dynamic multiprotocol applications.

config IEEE802154_NRF5_UICR_EUI64_ENABLE
bool "Using EUI64 value stored in UICR registers"
bool "Support usage of EUI64 value stored in UICR registers"
depends on !IEEE802154_VENDOR_OUI_ENABLE
depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X
help
Expand Down
4 changes: 2 additions & 2 deletions drivers/led_strip/Kconfig.ws2812
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ choice WS2812_STRIP_DRIVER
depends on WS2812_STRIP

config WS2812_STRIP_SPI
bool "The SPI driver"
bool "SPI driver"
depends on SPI
help
The SPI driver is portable, but requires significantly more
memory (1 byte of overhead per bit of pixel data).

config WS2812_STRIP_GPIO
bool "The GPIO driver"
bool "GPIO driver"
# Only an Cortex-M0 inline assembly implementation for the nRF51
# is supported currently.
depends on SOC_SERIES_NRF51X
Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/grove_lcd_rgb/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module-str = grove_lcd_rgb
source "subsys/logging/Kconfig.template.log_config"

config GROVE_LCD_RGB
bool "The Seeed Grove LCD RGB Backlight"
bool "Seeed Grove LCD RGB Backlight"
help
Setting this value will enable driver support for the Groove-LCD RGB
Backlight.
4 changes: 2 additions & 2 deletions drivers/modem/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,15 @@ config MODEM_SHELL
sending a command to the modem UART.

config MODEM_SIM_NUMBERS
bool "Querying the SIM for IMSI and ICCID"
bool "Query the SIM for IMSI and ICCID"
depends on MODEM_SHELL
default y
help
Query the SIM card for the IMSI and ICCID identifiers. This
can be disabled if the application does not use a SIM.

config MODEM_CELL_INFO
bool "Querying for operator and cell info"
bool "Query for operator and cell info"
depends on MODEM_SHELL
help
Query for numerical operator id, location area code and cell id.
Expand Down
2 changes: 1 addition & 1 deletion lib/os/Kconfig.heap
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ config SYS_HEAP_RUNTIME_STATS
Gather system heap runtime statistics.

config SYS_HEAP_LISTENER
bool "Sys_heap event notifications"
bool "sys_heap event notifications"
select HEAP_LISTENER
help
This allows application to listen for sys_heap events,
Expand Down
64 changes: 32 additions & 32 deletions modules/mbedtls/Kconfig.tls-generic
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@ config MBEDTLS_KEY_EXCHANGE_ALL_ENABLED
select MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED

config MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
bool "The PSK based ciphersuite modes"
bool "PSK based ciphersuite modes"

config MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
bool "The DHE-PSK based ciphersuite modes"
bool "DHE-PSK based ciphersuite modes"

config MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
bool "The ECDHE-PSK based ciphersuite modes"
bool "ECDHE-PSK based ciphersuite modes"

config MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
bool "The RSA-PSK based ciphersuite modes"
bool "RSA-PSK based ciphersuite modes"

config MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED
bool
Expand All @@ -88,29 +88,29 @@ config MBEDTLS_PSK_MAX_LEN
Max size of TLS pre-shared keys, in bytes.

config MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
bool "The RSA-only based ciphersuite modes"
bool "RSA-only based ciphersuite modes"
default y if !NET_L2_OPENTHREAD

config MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
bool "The DHE-RSA based ciphersuite modes"
bool "DHE-RSA based ciphersuite modes"

config MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
bool "The ECDHE-RSA based ciphersuite modes"
bool "ECDHE-RSA based ciphersuite modes"

config MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
bool "The ECDHE-ECDSA based ciphersuite modes"
bool "ECDHE-ECDSA based ciphersuite modes"

config MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
bool "The ECDH-ECDSA based ciphersuite modes"
bool "ECDH-ECDSA based ciphersuite modes"

config MBEDTLS_ECDSA_DETERMINISTIC
bool "Deterministic ECDSA (RFC 6979)"

config MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
bool "The ECDH-RSA based ciphersuite modes"
bool "ECDH-RSA based ciphersuite modes"

config MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
bool "The ECJPAKE based ciphersuite modes"
bool "ECJPAKE based ciphersuite modes"

if MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED || \
MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED || \
Expand Down Expand Up @@ -216,7 +216,7 @@ config MBEDTLS_CIPHER_ALL_ENABLED
select MBEDTLS_CHACHAPOLY_AEAD_ENABLED

config MBEDTLS_CIPHER_AES_ENABLED
bool "The AES block cipher"
bool "AES block cipher"
default y

config MBEDTLS_AES_ROM_TABLES
Expand All @@ -225,27 +225,27 @@ config MBEDTLS_AES_ROM_TABLES
default y

config MBEDTLS_CIPHER_CAMELLIA_ENABLED
bool "The Camellia block cipher"
bool "Camellia block cipher"

config MBEDTLS_CIPHER_DES_ENABLED
bool "The DES block cipher"
bool "DES block cipher"
default y if !NET_L2_OPENTHREAD

config MBEDTLS_CIPHER_ARC4_ENABLED
bool "The ARC4 stream cipher"
bool "ARC4 stream cipher"

config MBEDTLS_CIPHER_CHACHA20_ENABLED
bool "The ChaCha20 stream cipher"
bool "ChaCha20 stream cipher"

config MBEDTLS_CIPHER_BLOWFISH_ENABLED
bool "The Blowfish block cipher"
bool "Blowfish block cipher"

config MBEDTLS_CIPHER_CCM_ENABLED
bool "The Counter with CBC-MAC (CCM) mode for 128-bit block cipher"
bool "Counter with CBC-MAC (CCM) mode for 128-bit block cipher"
depends on MBEDTLS_CIPHER_AES_ENABLED || MBEDTLS_CIPHER_CAMELLIA_ENABLED

config MBEDTLS_CIPHER_GCM_ENABLED
bool "The Galois/Counter Mode (GCM) for AES"
bool "Galois/Counter Mode (GCM) for AES"
depends on MBEDTLS_CIPHER_AES_ENABLED || MBEDTLS_CIPHER_CAMELLIA_ENABLED

config MBEDTLS_CIPHER_MODE_XTS_ENABLED
Expand All @@ -260,7 +260,7 @@ config MBEDTLS_CIPHER_MODE_CTR_ENABLED
bool "Counter Block Cipher mode (CTR) for symmetric ciphers."

config MBEDTLS_CHACHAPOLY_AEAD_ENABLED
bool "The ChaCha20-Poly1305 AEAD algorithm"
bool "ChaCha20-Poly1305 AEAD algorithm"
depends on MBEDTLS_CIPHER_CHACHA20_ENABLED || MBEDTLS_MAC_POLY1305_ENABLED

comment "Supported message authentication methods"
Expand All @@ -276,18 +276,18 @@ config MBEDTLS_MAC_ALL_ENABLED
select MBEDTLS_MAC_CMAC_ENABLED

config MBEDTLS_MAC_MD4_ENABLED
bool "The MD4 hash algorithm"
bool "MD4 hash algorithm"

config MBEDTLS_MAC_MD5_ENABLED
bool "The MD5 hash algorithm"
bool "MD5 hash algorithm"
default y if !NET_L2_OPENTHREAD

config MBEDTLS_MAC_SHA1_ENABLED
bool "The SHA1 hash algorithm"
bool "SHA1 hash algorithm"
default y if !NET_L2_OPENTHREAD

config MBEDTLS_MAC_SHA256_ENABLED
bool "The SHA-224 and SHA-256 hash algorithms"
bool "SHA-224 and SHA-256 hash algorithms"
default y

config MBEDTLS_SHA256_SMALLER
Expand All @@ -299,38 +299,38 @@ config MBEDTLS_SHA256_SMALLER
lower performance

config MBEDTLS_MAC_SHA512_ENABLED
bool "The SHA-384 and SHA-512 hash algorithms"
bool "SHA-384 and SHA-512 hash algorithms"

config MBEDTLS_MAC_POLY1305_ENABLED
bool "The Poly1305 MAC algorithm"
bool "Poly1305 MAC algorithm"

config MBEDTLS_MAC_CMAC_ENABLED
bool "The CMAC (Cipher-based Message Authentication Code) mode for block ciphers."
bool "CMAC (Cipher-based Message Authentication Code) mode for block ciphers."
depends on MBEDTLS_CIPHER_AES_ENABLED || MBEDTLS_CIPHER_DES_ENABLED

endmenu

comment "Random number generators"

config MBEDTLS_CTR_DRBG_ENABLED
bool "The CTR_DRBG AES-256-based random generator"
bool "CTR_DRBG AES-256-based random generator"
depends on MBEDTLS_CIPHER_AES_ENABLED
default y

config MBEDTLS_HMAC_DRBG_ENABLED
bool "The HMAC_DRBG random generator"
bool "HMAC_DRBG random generator"
select MBEDTLS_MD

comment "Other configurations"

config MBEDTLS_CIPHER
bool "The generic cipher layer."
bool "generic cipher layer."

config MBEDTLS_MD
bool "The generic message digest layer."
bool "generic message digest layer."

config MBEDTLS_GENPRIME_ENABLED
bool "The prime-number generation code."
bool "prime-number generation code."

config MBEDTLS_PEM_CERTIFICATE_FORMAT
bool "Support for PEM certificate format"
Expand Down
4 changes: 2 additions & 2 deletions soc/arm/atmel_sam0/common/Kconfig.samd2x
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
if SOC_SERIES_SAMD20 || SOC_SERIES_SAMD21 || SOC_SERIES_SAMR21

config SOC_ATMEL_SAMD_XOSC32K
bool "The external 32 kHz crystal oscillator"
bool "External 32 kHz crystal oscillator"
help
Say y to enable the external 32 kHZ crystal oscillator at
startup. This can then be selected as the main clock source
for the SOC.

config SOC_ATMEL_SAMD_XOSC
bool "The external crystal oscillator"
bool "External crystal oscillator"
help
Say y to enable the external crystal oscillator at startup.

Expand Down
2 changes: 1 addition & 1 deletion soc/arm/nordic_nrf/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ config NRF_SECURE_APPROTECT_USER_HANDLING
endchoice

config NRF_TRACE_PORT
bool "NRF TPIU"
bool "nRF TPIU"
depends on !SOC_SERIES_NRF51X
help
Enable this option to initialize the TPIU (Trace Port Interface
Expand Down
2 changes: 1 addition & 1 deletion soc/arm/nordic_nrf/nrf91/Kconfig.soc
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@ config SOC_NRF9160_SICA
endchoice

config NRF_ENABLE_ICACHE
bool "The instruction cache (I-Cache)"
bool "Instruction cache (I-Cache)"
depends on SOC_NRF9160
default y
2 changes: 1 addition & 1 deletion soc/arm/nxp_imx/rt/Kconfig.soc
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ config PM_MCUX_PMU
bool "MCUX power management unit driver"

menuconfig NXP_IMX_RT_BOOT_HEADER
bool "The boot header"
bool "Boot header"
depends on !BOOTLOADER_MCUBOOT
help
Enable data structures required by the boot ROM to boot the
Expand Down
Loading

0 comments on commit dffaf53

Please sign in to comment.