kconfig: Turn pointless/confusing 'menuconfig's into 'config's

Defining a symbol with 'menuconfig' just tells the menuconfig to display
any dependent symbols that immediately follow it in a separate menu.
'menuconfig' has no effect on symbol values.

Making a symbol that doesn't have any dependent symbols after it a
'menuconfig' should be avoided, because then you end up with an empty
menu, which is shown as e.g.

    [*] Enable foo ---

This is how it would be shown if there were children but they all
happened to be invisible as well.

With a regular 'config', it turns into

    [*] Enable foo

Change all pointless 'menuconfig's to 'config's.

See the section on 'menuconfig' on the Kconfig - Tips and Best Practices
page as well.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
This commit is contained in:
Ulf Magnusson 2019-10-22 01:04:04 +02:00 committed by Maureen Helm
commit 677f1e6db9
71 changed files with 90 additions and 97 deletions

View file

@ -6,7 +6,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig ADC_SAM_AFEC
config ADC_SAM_AFEC
bool "SAM ADC Driver"
depends on SOC_FAMILY_SAM
help

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig AUDIO_INTEL_DMIC
config AUDIO_INTEL_DMIC
bool "Intel digital PDM microphone driver support"
help
Enable Intel digital PDM microphone driver

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig AUDIO_MPXXDTYY
config AUDIO_MPXXDTYY
bool "ST Digital PDM microphone attached to I2S support"
depends on I2S
select HAS_STLIB

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig AUDIO_TLV320DAC
config AUDIO_TLV320DAC
bool "TLV320DAC310x DAC support"
depends on I2C && GPIO
help

View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig CLOCK_CONTROL_MCUX_CCM
config CLOCK_CONTROL_MCUX_CCM
bool "MCUX CCM driver"
depends on HAS_MCUX_CCM
help

View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig CLOCK_CONTROL_MCUX_MCG
config CLOCK_CONTROL_MCUX_MCG
bool "MCUX MCG driver"
depends on HAS_MCG
help

View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig CLOCK_CONTROL_MCUX_PCC
config CLOCK_CONTROL_MCUX_PCC
bool "MCUX PCC driver"
depends on HAS_MCUX_PCC
help

View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig CLOCK_CONTROL_MCUX_SCG
config CLOCK_CONTROL_MCUX_SCG
bool "MCUX SCG driver"
depends on HAS_MCUX_SCG
help

View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig CLOCK_CONTROL_MCUX_SIM
config CLOCK_CONTROL_MCUX_SIM
bool "MCUX SIM driver"
depends on HAS_MCUX_SIM
help

View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig CLOCK_CONTROL_RV32M1_PCC
config CLOCK_CONTROL_RV32M1_PCC
bool "RV32M1 PCC driver"
depends on SOC_OPENISA_RV32M1_RISCV32
help

View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig COUNTER_MCUX_RTC
config COUNTER_MCUX_RTC
bool "MCUX RTC driver"
depends on HAS_MCUX_RTC
help

View file

@ -6,7 +6,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig SSD16XX
config SSD16XX
bool "SSD16XX compatible display controller driver"
depends on SPI
help

View file

@ -6,7 +6,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig DMA_CAVS
config DMA_CAVS
bool "Enable CAVS DMA driver"
help
CAVS DMA driver.

View file

@ -3,7 +3,7 @@
# Copyright (c) 2018 Google LLC.
# SPDX-License-Identifier: Apache-2.0
menuconfig DMA_SAM0
config DMA_SAM0
bool "Atmel SAM0 series DMAC driver"
default y
depends on SOC_FAMILY_SAM0

View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig DMA_SAM_XDMAC
config DMA_SAM_XDMAC
bool "Atmel SAM DMA (XDMAC) driver"
depends on SOC_FAMILY_SAM
help

View file

@ -6,7 +6,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig DMA_STM32F4X
config DMA_STM32F4X
bool "Enable STM32F4x DMA driver"
depends on SOC_SERIES_STM32F4X
help

View file

@ -4,7 +4,7 @@
#
# SPDX-License-Identifier: Apache-2.0
menuconfig ENTROPY_MCUX_RNGA
config ENTROPY_MCUX_RNGA
bool "MCUX RNGA driver"
depends on HAS_MCUX_RNGA
select ENTROPY_HAS_DRIVER
@ -13,7 +13,7 @@ menuconfig ENTROPY_MCUX_RNGA
This option enables the random number generator accelerator (RNGA)
driver based on the MCUX RNGA driver.
menuconfig ENTROPY_MCUX_TRNG
config ENTROPY_MCUX_TRNG
bool "MCUX TRNG driver"
depends on HAS_MCUX_TRNG
select ENTROPY_HAS_DRIVER

View file

@ -1,6 +1,6 @@
# SPDX-License-Identifier: Apache-2.0
menuconfig FAKE_ENTROPY_NATIVE_POSIX
config FAKE_ENTROPY_NATIVE_POSIX
bool "Native posix entropy driver"
depends on ARCH_POSIX
select ENTROPY_HAS_DRIVER

View file

@ -4,7 +4,7 @@
#
# SPDX-License-Identifier: Apache-2.0
menuconfig ENTROPY_SAM_RNG
config ENTROPY_SAM_RNG
bool "Atmel SAM MCU Family True Random Number Generator (TRNG) Driver"
depends on SOC_FAMILY_SAM
select ENTROPY_HAS_DRIVER

View file

@ -4,7 +4,7 @@
#
# SPDX-License-Identifier: Apache-2.0
menuconfig ENTROPY_STM32_RNG
config ENTROPY_STM32_RNG
bool "STM32 RNG driver"
depends on SOC_FAMILY_STM32
select ENTROPY_HAS_DRIVER

View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig ESPI_XEC
config ESPI_XEC
bool "XEC Microchip ESPI driver"
help
Enable the Microchip XEC ESPI driver.

View file

@ -5,7 +5,7 @@
if SOC_FAMILY_SAM
menuconfig SOC_FLASH_SAM
config SOC_FLASH_SAM
bool "Atmel SAM flash driver"
default y
select FLASH_HAS_PAGE_LAYOUT

View file

@ -8,7 +8,7 @@
if SOC_FAMILY_STM32
menuconfig SOC_FLASH_STM32
config SOC_FLASH_STM32
bool "STM32 flash driver"
depends on (SOC_SERIES_STM32F0X || SOC_SERIES_STM32F3X || SOC_SERIES_STM32F4X || SOC_SERIES_STM32F7X || SOC_SERIES_STM32L4X || SOC_SERIES_STM32WBX || SOC_SERIES_STM32G0X || SOC_SERIES_STM32G4X)
select FLASH_HAS_DRIVER_ENABLED

View file

@ -3,7 +3,7 @@
# Copyright (c) 2018 Justin Watson
# SPDX-License-Identifier: Apache-2.0
menuconfig GPIO_SAM
config GPIO_SAM
bool "Atmel SAM GPIO (PORT) driver"
default y
depends on SOC_FAMILY_SAM

View file

@ -3,7 +3,7 @@
# Copyright (c) 2017 Google LLC.
# SPDX-License-Identifier: Apache-2.0
menuconfig GPIO_SAM0
config GPIO_SAM0
bool "Atmel SAM0 GPIO (PORT) driver"
default y
depends on SOC_FAMILY_SAM0

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig I2C_SBCON
config I2C_SBCON
bool "I2C driver for ARM's SBCon two-wire serial bus interface"
depends on ARM
select I2C_BITBANG

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig I2C_SIFIVE
config I2C_SIFIVE
bool "Sifive I2C driver"
depends on SOC_SERIES_RISCV_SIFIVE_FREEDOM
depends on HAS_DTS_I2C

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig LP3943
config LP3943
bool "LP3943 LED driver"
depends on I2C
help

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig PCA9633
config PCA9633
bool "PCA9633 LED driver"
depends on I2C
help

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig APA102_STRIP
config APA102_STRIP
bool "APA102 SPI LED strip driver"
depends on SPI
select LED_STRIP_RGB_SCRATCH

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig LPD880X_STRIP
config LPD880X_STRIP
bool "Enable LPD880x SPI LED strip driver"
depends on SPI
help

View file

@ -6,7 +6,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig PINMUX_BEETLE
config PINMUX_BEETLE
bool "ARM V2M Beetle Pin multiplexer driver"
depends on SOC_SERIES_BEETLE
help

View file

@ -6,7 +6,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig PINMUX_ESP32
config PINMUX_ESP32
bool "ESP32 Pin multiplexer driver"
depends on SOC_ESP32
help

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig PINMUX_HSDK
config PINMUX_HSDK
bool "ARC HSDK I/O pin mux driver"
depends on SOC_ARC_HSDK
help

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig PINMUX_INTEL_S1000
config PINMUX_INTEL_S1000
bool "Intel S1000 I/O multiplexer driver"
depends on SOC_INTEL_S1000
help

View file

@ -3,7 +3,7 @@
# Copyright (c) 2018 Google LLC.
# SPDX-License-Identifier: Apache-2.0
menuconfig PINMUX_SAM0
config PINMUX_SAM0
bool "Atmel SAM0 pin multiplexer driver"
default y
depends on SOC_FAMILY_SAM0

View file

@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig PTP_CLOCK
config PTP_CLOCK
bool "Precision Time Protocol Clock driver support"
help
Enable options for Precision Time Protocol Clock drivers.

View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig PWM_MCUX_FTM
config PWM_MCUX_FTM
bool "MCUX FTM PWM driver"
depends on HAS_MCUX_FTM
help

View file

@ -6,7 +6,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig PWM_NRF5_SW
config PWM_NRF5_SW
bool "Nordic Semiconductor nRF5x series S/W PWM"
default y if !PWM_NRFX
depends on SOC_FAMILY_NRF

View file

@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig PWM_NRFX
config PWM_NRFX
bool "nRF PWM nrfx driver"
default y
depends on HAS_HW_NRF_PWM0 || HAS_HW_NRF_PWM1 || \

View file

@ -4,7 +4,7 @@
#
# SPDX-License-Identifier: Apache-2.0
menuconfig PWM_SAM
config PWM_SAM
bool "Atmel SAM MCU Family PWM Driver"
depends on SOC_FAMILY_SAM
help

View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig OPT3001
config OPT3001
bool "OPT3001 Light Sensor"
depends on (I2C && HAS_DTS_I2C)
help

View file

@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig QDEC_NRFX
config QDEC_NRFX
bool "Nordic QDEC nrfx driver"
depends on HAS_HW_NRF_QDEC
select NRFX_QDEC

View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig SI7060
config SI7060
bool "SI7060 Temperature Sensor"
depends on (I2C && HAS_DTS_I2C)
help

View file

@ -6,7 +6,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig TI_HDC
config TI_HDC
bool "Texas Instruments Temperature and Humidity Sensor (e.g. HDC1008)"
depends on I2C && HAS_DTS_I2C
help

View file

@ -6,7 +6,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig TMP116
config TMP116
bool "TMP116 Temperature Sensor"
depends on I2C && HAS_DTS_I2C
help

View file

@ -1,6 +1,6 @@
# SPDX-License-Identifier: Apache-2.0
menuconfig UART_ALTERA_JTAG
config UART_ALTERA_JTAG
bool "Nios II JTAG UART driver"
select SERIAL_HAS_DRIVER
help

View file

@ -1,6 +1,6 @@
# SPDX-License-Identifier: Apache-2.0
menuconfig UART_CC32XX
config UART_CC32XX
depends on SOC_SERIES_CC32XX
bool "CC32XX UART driver"
select SERIAL_HAS_DRIVER

View file

@ -6,7 +6,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig UART_CMSDK_APB
config UART_CMSDK_APB
bool "ARM CMSDK APB UART driver"
select SERIAL_HAS_DRIVER
select SERIAL_SUPPORT_INTERRUPT

View file

@ -1,6 +1,6 @@
# SPDX-License-Identifier: Apache-2.0
menuconfig UART_ESP32
config UART_ESP32
bool "ESP32 UART driver"
default y
select SERIAL_HAS_DRIVER

View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig UART_GECKO
config UART_GECKO
bool "Gecko UART/USART driver"
depends on HAS_SILABS_GECKO
depends on GPIO_GECKO
@ -14,7 +14,3 @@ menuconfig UART_GECKO
select SOC_GECKO_USART
help
Enable the Gecko uart driver.
if UART_GECKO
endif # UART_GECKO

View file

@ -15,32 +15,32 @@ menuconfig UART_MCUX
if UART_MCUX
menuconfig UART_MCUX_0
config UART_MCUX_0
bool "UART 0"
help
Enable UART 0.
menuconfig UART_MCUX_1
config UART_MCUX_1
bool "UART 1"
help
Enable UART 1.
menuconfig UART_MCUX_2
config UART_MCUX_2
bool "UART 2"
help
Enable UART 2.
menuconfig UART_MCUX_3
config UART_MCUX_3
bool "UART 3"
help
Enable UART 3.
menuconfig UART_MCUX_4
config UART_MCUX_4
bool "UART 4"
help
Enable UART 4.
menuconfig UART_MCUX_5
config UART_MCUX_5
bool "UART 5"
help
Enable UART 5.

View file

@ -14,7 +14,7 @@ menuconfig USART_MCUX_LPC
if USART_MCUX_LPC
menuconfig USART_MCUX_LPC_0
config USART_MCUX_LPC_0
bool "USART 0"
help
Enable USART 0.

View file

@ -13,11 +13,8 @@ menuconfig UART_MCUX_LPSCI
help
Enable the MCUX LPSCI driver.
if UART_MCUX_LPSCI
menuconfig UART_MCUX_LPSCI_0
config UART_MCUX_LPSCI_0
bool "UART 0"
depends on UART_MCUX_LPSCI
help
Enable UART 0.
endif # UART_MCUX_LPSCI

View file

@ -15,27 +15,27 @@ menuconfig UART_MCUX_LPUART
if UART_MCUX_LPUART
menuconfig UART_MCUX_LPUART_0
config UART_MCUX_LPUART_0
bool "UART 0"
help
Enable UART 0.
menuconfig UART_MCUX_LPUART_1
config UART_MCUX_LPUART_1
bool "UART 1"
help
Enable UART 1.
menuconfig UART_MCUX_LPUART_2
config UART_MCUX_LPUART_2
bool "UART 2"
help
Enable UART 2.
menuconfig UART_MCUX_LPUART_3
config UART_MCUX_LPUART_3
bool "UART 3"
help
Enable UART 3.
menuconfig UART_MCUX_LPUART_4
config UART_MCUX_LPUART_4
bool "UART 4"
help
Enable UART 4.

View file

@ -5,14 +5,14 @@
# Copyright (c) 2018 Antmicro <www.antmicro.com>
#
menuconfig UART_MIV
config UART_MIV
bool "Mi-V serial driver"
depends on SOC_RISCV32_MIV
select SERIAL_HAS_DRIVER
help
This option enables the Mi-V serial driver.
menuconfig UART_MIV_PORT_0
config UART_MIV_PORT_0
bool "Enable Mi-V Port 0"
depends on UART_MIV
help

View file

@ -1,6 +1,6 @@
# SPDX-License-Identifier: Apache-2.0
menuconfig UART_MSP432P4XX
config UART_MSP432P4XX
depends on SOC_SERIES_MSP432P4XX
bool "MSP432P4XX UART driver"
select SERIAL_HAS_DRIVER

View file

@ -15,24 +15,24 @@ menuconfig UART_RV32M1_LPUART
if UART_RV32M1_LPUART
menuconfig UART_RV32M1_LPUART_0
config UART_RV32M1_LPUART_0
bool "UART 0"
help
Enable UART 0.
menuconfig UART_RV32M1_LPUART_1
config UART_RV32M1_LPUART_1
bool "UART 1"
depends on RV32M1_INTMUX
help
Enable UART 1.
menuconfig UART_RV32M1_LPUART_2
config UART_RV32M1_LPUART_2
bool "UART 2"
depends on RV32M1_INTMUX
help
Enable UART 2.
menuconfig UART_RV32M1_LPUART_3
config UART_RV32M1_LPUART_3
bool "UART 3"
depends on RV32M1_INTMUX
help

View file

@ -6,7 +6,7 @@
# Workaround for not being able to have commas in macro arguments
DT_COMPAT_ATMEL_SAM0_DMAC := atmel,sam0-dmac
menuconfig UART_SAM0
config UART_SAM0
bool "Atmel SAM0 series SERCOM USART driver"
default y
depends on SOC_FAMILY_SAM0

View file

@ -14,7 +14,7 @@ if UART_STELLARIS
# ---------- Port 0 ----------
menuconfig UART_STELLARIS_PORT_0
config UART_STELLARIS_PORT_0
bool "Enable Stellaris UART Port 0"
help
This tells the driver to configure the UART port at boot, depending on
@ -22,7 +22,7 @@ menuconfig UART_STELLARIS_PORT_0
# ---------- Port 1 ----------
menuconfig UART_STELLARIS_PORT_1
config UART_STELLARIS_PORT_1
bool "Enable Stellaris UART Port 1"
help
This tells the driver to configure the UART port at boot, depending on
@ -30,7 +30,7 @@ menuconfig UART_STELLARIS_PORT_1
# ---------- Port 2 ----------
menuconfig UART_STELLARIS_PORT_2
config UART_STELLARIS_PORT_2
bool "Enable Stellaris UART Port 2"
help
This tells the driver to configure the UART port at boot, depending on

View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig UART_XLNX_PS
config UART_XLNX_PS
bool "Xilinx serial driver for MPSoC"
depends on SOC_XILINX_ZYNQMP
select SERIAL_HAS_DRIVER

View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig SPI_LITESPI
config SPI_LITESPI
bool "LiteX SPI controller driver"
depends on SOC_RISCV32_LITEX_VEXRISCV
help

View file

@ -6,7 +6,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig SPI_MCUX_DSPI
config SPI_MCUX_DSPI
bool "MCUX SPI driver"
depends on HAS_MCUX && CLOCK_CONTROL
help

View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig SPI_MCUX_LPSPI
config SPI_MCUX_LPSPI
bool "MCUX SPI driver"
depends on HAS_MCUX_LPSPI && CLOCK_CONTROL
help

View file

@ -3,7 +3,7 @@
# Copyright (c) 2017 Google LLC.
# SPDX-License-Identifier: Apache-2.0
menuconfig SPI_SAM0
config SPI_SAM0
bool "Atmel SAM0 series SERCOM SPI driver"
default y
depends on SOC_FAMILY_SAM0

View file

@ -58,7 +58,7 @@ endif # APIC_TIMER_TSC
endif # APIC_TIMER
menuconfig HPET_TIMER
config HPET_TIMER
bool "HPET timer"
depends on (X86 || X86_64)
select IOAPIC if X86
@ -69,7 +69,7 @@ menuconfig HPET_TIMER
This option selects High Precision Event Timer (HPET) as a
system timer.
menuconfig LOAPIC_TIMER
config LOAPIC_TIMER
bool "LOAPIC timer"
depends on LOAPIC && X86
help

View file

@ -5,14 +5,14 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig WDT_MCUX_WDOG
config WDT_MCUX_WDOG
bool "MCUX WDOG driver"
depends on HAS_MCUX && !HAS_MCUX_WDOG32 && CLOCK_CONTROL
select HAS_DTS_WDT
help
Enable the mcux wdog driver.
menuconfig WDT_MCUX_WDOG32
config WDT_MCUX_WDOG32
bool "MCUX WDOG32 driver"
depends on HAS_MCUX_WDOG32 && CLOCK_CONTROL
select HAS_DTS_WDT

View file

@ -4,7 +4,7 @@
#
# SPDX-License-Identifier: Apache-2.0
menuconfig WDT_NRFX
config WDT_NRFX
bool "nRF WDT nrfx driver"
default y
depends on SOC_FAMILY_NRF

View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig WDT_SAM
config WDT_SAM
bool "Atmel SAM MCU Family Watchdog (WDT) Driver"
depends on SOC_FAMILY_SAM
select HAS_DTS_WDT

View file

@ -5,6 +5,6 @@
#
# SPDX-License-Identifier: Apache-2.0
menuconfig HAS_ALTERA_HAL
config HAS_ALTERA_HAL
bool "Altera HAL drivers support"
depends on NIOS2

View file

@ -1,7 +1,7 @@
# Copyright (c) 2018 Foundries.io
# SPDX-License-Identifier: Apache-2.0
menuconfig VEGA_SDK_HAL
config VEGA_SDK_HAL
bool "RV32M1 VEGA SDK support"
depends on SOC_OPENISA_RV32M1_RISCV32