From 677f1e6db903ae994c13f166198920d49a9181cd Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Tue, 22 Oct 2019 01:04:04 +0200 Subject: [PATCH] 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 --- drivers/adc/Kconfig.sam_afec | 2 +- drivers/audio/Kconfig.intel_dmic | 2 +- drivers/audio/Kconfig.mpxxdtyy | 2 +- drivers/audio/Kconfig.tlv320dac | 2 +- drivers/clock_control/Kconfig.mcux_ccm | 2 +- drivers/clock_control/Kconfig.mcux_mcg | 2 +- drivers/clock_control/Kconfig.mcux_pcc | 2 +- drivers/clock_control/Kconfig.mcux_scg | 2 +- drivers/clock_control/Kconfig.mcux_sim | 2 +- drivers/clock_control/Kconfig.rv32m1 | 2 +- drivers/counter/Kconfig.mcux_rtc | 2 +- drivers/display/Kconfig.ssd16xx | 2 +- drivers/dma/Kconfig.cavs | 2 +- drivers/dma/Kconfig.sam0 | 2 +- drivers/dma/Kconfig.sam_xdmac | 2 +- drivers/dma/Kconfig.stm32f4x | 2 +- drivers/entropy/Kconfig.mcux | 4 ++-- drivers/entropy/Kconfig.native_posix | 2 +- drivers/entropy/Kconfig.sam | 2 +- drivers/entropy/Kconfig.stm32 | 2 +- drivers/espi/Kconfig.xec | 2 +- drivers/flash/Kconfig.sam | 2 +- drivers/flash/Kconfig.stm32 | 2 +- drivers/gpio/Kconfig.sam | 2 +- drivers/gpio/Kconfig.sam0 | 2 +- drivers/i2c/Kconfig.sbcon | 2 +- drivers/i2c/Kconfig.sifive | 2 +- drivers/led/Kconfig.lp3943 | 2 +- drivers/led/Kconfig.pca9633 | 2 +- drivers/led_strip/Kconfig.apa102 | 2 +- drivers/led_strip/Kconfig.lpd880x | 2 +- drivers/pinmux/Kconfig.beetle | 2 +- drivers/pinmux/Kconfig.esp32 | 2 +- drivers/pinmux/Kconfig.hsdk | 2 +- drivers/pinmux/Kconfig.intel_s1000 | 2 +- drivers/pinmux/Kconfig.sam0 | 2 +- drivers/ptp_clock/Kconfig | 2 +- drivers/pwm/Kconfig.mcux_ftm | 2 +- drivers/pwm/Kconfig.nrf5_sw | 2 +- drivers/pwm/Kconfig.nrfx | 2 +- drivers/pwm/Kconfig.sam | 2 +- drivers/sensor/opt3001/Kconfig | 2 +- drivers/sensor/qdec_nrfx/Kconfig | 2 +- drivers/sensor/si7060/Kconfig | 2 +- drivers/sensor/ti_hdc/Kconfig | 2 +- drivers/sensor/tmp116/Kconfig | 2 +- drivers/serial/Kconfig.altera_jtag | 2 +- drivers/serial/Kconfig.cc32xx | 2 +- drivers/serial/Kconfig.cmsdk_apb | 2 +- drivers/serial/Kconfig.esp32 | 2 +- drivers/serial/Kconfig.gecko | 6 +----- drivers/serial/Kconfig.mcux | 12 ++++++------ drivers/serial/Kconfig.mcux_lpc_usart | 2 +- drivers/serial/Kconfig.mcux_lpsci | 7 ++----- drivers/serial/Kconfig.mcux_lpuart | 10 +++++----- drivers/serial/Kconfig.miv | 4 ++-- drivers/serial/Kconfig.msp432p4xx | 2 +- drivers/serial/Kconfig.rv32m1_lpuart | 8 ++++---- drivers/serial/Kconfig.sam0 | 2 +- drivers/serial/Kconfig.stellaris | 6 +++--- drivers/serial/Kconfig.xlnx | 2 +- drivers/spi/Kconfig.litex | 2 +- drivers/spi/Kconfig.mcux_dspi | 2 +- drivers/spi/Kconfig.mcux_lpspi | 2 +- drivers/spi/Kconfig.sam0 | 2 +- drivers/timer/Kconfig | 4 ++-- drivers/watchdog/Kconfig.mcux | 4 ++-- drivers/watchdog/Kconfig.nrfx | 2 +- drivers/watchdog/Kconfig.sam | 2 +- ext/hal/altera/Kconfig | 2 +- modules/Kconfig.vega | 2 +- 71 files changed, 90 insertions(+), 97 deletions(-) diff --git a/drivers/adc/Kconfig.sam_afec b/drivers/adc/Kconfig.sam_afec index d6100161c1a..86ccbe3c297 100644 --- a/drivers/adc/Kconfig.sam_afec +++ b/drivers/adc/Kconfig.sam_afec @@ -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 diff --git a/drivers/audio/Kconfig.intel_dmic b/drivers/audio/Kconfig.intel_dmic index ec48ccc920f..f96c383e272 100644 --- a/drivers/audio/Kconfig.intel_dmic +++ b/drivers/audio/Kconfig.intel_dmic @@ -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 diff --git a/drivers/audio/Kconfig.mpxxdtyy b/drivers/audio/Kconfig.mpxxdtyy index d37b0a2b78b..2842a806d43 100644 --- a/drivers/audio/Kconfig.mpxxdtyy +++ b/drivers/audio/Kconfig.mpxxdtyy @@ -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 diff --git a/drivers/audio/Kconfig.tlv320dac b/drivers/audio/Kconfig.tlv320dac index 43cc702f359..7d10fbf166b 100644 --- a/drivers/audio/Kconfig.tlv320dac +++ b/drivers/audio/Kconfig.tlv320dac @@ -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 diff --git a/drivers/clock_control/Kconfig.mcux_ccm b/drivers/clock_control/Kconfig.mcux_ccm index f82017c0509..1f36f31825e 100644 --- a/drivers/clock_control/Kconfig.mcux_ccm +++ b/drivers/clock_control/Kconfig.mcux_ccm @@ -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 diff --git a/drivers/clock_control/Kconfig.mcux_mcg b/drivers/clock_control/Kconfig.mcux_mcg index ca27dd2ac8b..84e83a30c88 100644 --- a/drivers/clock_control/Kconfig.mcux_mcg +++ b/drivers/clock_control/Kconfig.mcux_mcg @@ -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 diff --git a/drivers/clock_control/Kconfig.mcux_pcc b/drivers/clock_control/Kconfig.mcux_pcc index bb093c64c7c..057f578fdc9 100644 --- a/drivers/clock_control/Kconfig.mcux_pcc +++ b/drivers/clock_control/Kconfig.mcux_pcc @@ -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 diff --git a/drivers/clock_control/Kconfig.mcux_scg b/drivers/clock_control/Kconfig.mcux_scg index 468eaaab402..3e0416048b6 100644 --- a/drivers/clock_control/Kconfig.mcux_scg +++ b/drivers/clock_control/Kconfig.mcux_scg @@ -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 diff --git a/drivers/clock_control/Kconfig.mcux_sim b/drivers/clock_control/Kconfig.mcux_sim index 1c4eecdf749..ad858a80024 100644 --- a/drivers/clock_control/Kconfig.mcux_sim +++ b/drivers/clock_control/Kconfig.mcux_sim @@ -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 diff --git a/drivers/clock_control/Kconfig.rv32m1 b/drivers/clock_control/Kconfig.rv32m1 index 4e5d2f0fd74..d952469b4d2 100644 --- a/drivers/clock_control/Kconfig.rv32m1 +++ b/drivers/clock_control/Kconfig.rv32m1 @@ -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 diff --git a/drivers/counter/Kconfig.mcux_rtc b/drivers/counter/Kconfig.mcux_rtc index a59e92766b2..53695902af3 100644 --- a/drivers/counter/Kconfig.mcux_rtc +++ b/drivers/counter/Kconfig.mcux_rtc @@ -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 diff --git a/drivers/display/Kconfig.ssd16xx b/drivers/display/Kconfig.ssd16xx index b2296801a4f..ad0a5f05dd8 100644 --- a/drivers/display/Kconfig.ssd16xx +++ b/drivers/display/Kconfig.ssd16xx @@ -6,7 +6,7 @@ # SPDX-License-Identifier: Apache-2.0 # -menuconfig SSD16XX +config SSD16XX bool "SSD16XX compatible display controller driver" depends on SPI help diff --git a/drivers/dma/Kconfig.cavs b/drivers/dma/Kconfig.cavs index 9608c1cbb7a..df8616186f5 100644 --- a/drivers/dma/Kconfig.cavs +++ b/drivers/dma/Kconfig.cavs @@ -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. diff --git a/drivers/dma/Kconfig.sam0 b/drivers/dma/Kconfig.sam0 index 899b26e2ab6..9cd0471eb36 100644 --- a/drivers/dma/Kconfig.sam0 +++ b/drivers/dma/Kconfig.sam0 @@ -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 diff --git a/drivers/dma/Kconfig.sam_xdmac b/drivers/dma/Kconfig.sam_xdmac index f3887c61f03..53b99ca9381 100644 --- a/drivers/dma/Kconfig.sam_xdmac +++ b/drivers/dma/Kconfig.sam_xdmac @@ -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 diff --git a/drivers/dma/Kconfig.stm32f4x b/drivers/dma/Kconfig.stm32f4x index db0f3509bfa..372a7da3d62 100644 --- a/drivers/dma/Kconfig.stm32f4x +++ b/drivers/dma/Kconfig.stm32f4x @@ -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 diff --git a/drivers/entropy/Kconfig.mcux b/drivers/entropy/Kconfig.mcux index c932af2c142..993c3f6f5c1 100644 --- a/drivers/entropy/Kconfig.mcux +++ b/drivers/entropy/Kconfig.mcux @@ -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 diff --git a/drivers/entropy/Kconfig.native_posix b/drivers/entropy/Kconfig.native_posix index 5e1d87e4766..d8bb1833bab 100644 --- a/drivers/entropy/Kconfig.native_posix +++ b/drivers/entropy/Kconfig.native_posix @@ -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 diff --git a/drivers/entropy/Kconfig.sam b/drivers/entropy/Kconfig.sam index 510d46ea298..0063102a54b 100644 --- a/drivers/entropy/Kconfig.sam +++ b/drivers/entropy/Kconfig.sam @@ -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 diff --git a/drivers/entropy/Kconfig.stm32 b/drivers/entropy/Kconfig.stm32 index 27eb6cac427..c04f200dafb 100644 --- a/drivers/entropy/Kconfig.stm32 +++ b/drivers/entropy/Kconfig.stm32 @@ -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 diff --git a/drivers/espi/Kconfig.xec b/drivers/espi/Kconfig.xec index d7a3a34126a..d2686d3795d 100644 --- a/drivers/espi/Kconfig.xec +++ b/drivers/espi/Kconfig.xec @@ -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. diff --git a/drivers/flash/Kconfig.sam b/drivers/flash/Kconfig.sam index e92c2a03f59..0ce67a3fc5e 100644 --- a/drivers/flash/Kconfig.sam +++ b/drivers/flash/Kconfig.sam @@ -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 diff --git a/drivers/flash/Kconfig.stm32 b/drivers/flash/Kconfig.stm32 index 1fb88d55c05..c1d2d394638 100644 --- a/drivers/flash/Kconfig.stm32 +++ b/drivers/flash/Kconfig.stm32 @@ -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 diff --git a/drivers/gpio/Kconfig.sam b/drivers/gpio/Kconfig.sam index 8f57a267ef6..0b5f89901d6 100644 --- a/drivers/gpio/Kconfig.sam +++ b/drivers/gpio/Kconfig.sam @@ -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 diff --git a/drivers/gpio/Kconfig.sam0 b/drivers/gpio/Kconfig.sam0 index 6cbd7d50910..785920fc1c9 100644 --- a/drivers/gpio/Kconfig.sam0 +++ b/drivers/gpio/Kconfig.sam0 @@ -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 diff --git a/drivers/i2c/Kconfig.sbcon b/drivers/i2c/Kconfig.sbcon index 260ab0fc9f4..c56be89cd25 100644 --- a/drivers/i2c/Kconfig.sbcon +++ b/drivers/i2c/Kconfig.sbcon @@ -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 diff --git a/drivers/i2c/Kconfig.sifive b/drivers/i2c/Kconfig.sifive index 471c1b77217..fa2584b807b 100644 --- a/drivers/i2c/Kconfig.sifive +++ b/drivers/i2c/Kconfig.sifive @@ -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 diff --git a/drivers/led/Kconfig.lp3943 b/drivers/led/Kconfig.lp3943 index 285b69dd5b8..5480b61bf6d 100644 --- a/drivers/led/Kconfig.lp3943 +++ b/drivers/led/Kconfig.lp3943 @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -menuconfig LP3943 +config LP3943 bool "LP3943 LED driver" depends on I2C help diff --git a/drivers/led/Kconfig.pca9633 b/drivers/led/Kconfig.pca9633 index b5fa3ca4a61..dd524fbb302 100644 --- a/drivers/led/Kconfig.pca9633 +++ b/drivers/led/Kconfig.pca9633 @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -menuconfig PCA9633 +config PCA9633 bool "PCA9633 LED driver" depends on I2C help diff --git a/drivers/led_strip/Kconfig.apa102 b/drivers/led_strip/Kconfig.apa102 index d1d5fe6d7db..25e6a729f27 100644 --- a/drivers/led_strip/Kconfig.apa102 +++ b/drivers/led_strip/Kconfig.apa102 @@ -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 diff --git a/drivers/led_strip/Kconfig.lpd880x b/drivers/led_strip/Kconfig.lpd880x index b1fe2f4f7c4..a48a2d7eeed 100644 --- a/drivers/led_strip/Kconfig.lpd880x +++ b/drivers/led_strip/Kconfig.lpd880x @@ -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 diff --git a/drivers/pinmux/Kconfig.beetle b/drivers/pinmux/Kconfig.beetle index ccac1e833fb..72c89a7bf17 100644 --- a/drivers/pinmux/Kconfig.beetle +++ b/drivers/pinmux/Kconfig.beetle @@ -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 diff --git a/drivers/pinmux/Kconfig.esp32 b/drivers/pinmux/Kconfig.esp32 index f4741fc9888..4f62a803c1d 100644 --- a/drivers/pinmux/Kconfig.esp32 +++ b/drivers/pinmux/Kconfig.esp32 @@ -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 diff --git a/drivers/pinmux/Kconfig.hsdk b/drivers/pinmux/Kconfig.hsdk index 304f036c5e9..7f683b16194 100644 --- a/drivers/pinmux/Kconfig.hsdk +++ b/drivers/pinmux/Kconfig.hsdk @@ -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 diff --git a/drivers/pinmux/Kconfig.intel_s1000 b/drivers/pinmux/Kconfig.intel_s1000 index 6d0c9b8eb54..df2884043c9 100644 --- a/drivers/pinmux/Kconfig.intel_s1000 +++ b/drivers/pinmux/Kconfig.intel_s1000 @@ -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 diff --git a/drivers/pinmux/Kconfig.sam0 b/drivers/pinmux/Kconfig.sam0 index 61a2da4f58e..e4e789270d9 100644 --- a/drivers/pinmux/Kconfig.sam0 +++ b/drivers/pinmux/Kconfig.sam0 @@ -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 diff --git a/drivers/ptp_clock/Kconfig b/drivers/ptp_clock/Kconfig index 420e9d9b1af..fe3c38632ab 100644 --- a/drivers/ptp_clock/Kconfig +++ b/drivers/ptp_clock/Kconfig @@ -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. diff --git a/drivers/pwm/Kconfig.mcux_ftm b/drivers/pwm/Kconfig.mcux_ftm index 608aee33f8c..63681748d3c 100644 --- a/drivers/pwm/Kconfig.mcux_ftm +++ b/drivers/pwm/Kconfig.mcux_ftm @@ -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 diff --git a/drivers/pwm/Kconfig.nrf5_sw b/drivers/pwm/Kconfig.nrf5_sw index ca53e26d97d..337f74b8eb2 100644 --- a/drivers/pwm/Kconfig.nrf5_sw +++ b/drivers/pwm/Kconfig.nrf5_sw @@ -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 diff --git a/drivers/pwm/Kconfig.nrfx b/drivers/pwm/Kconfig.nrfx index 01ddbb61370..05b4a7b4357 100644 --- a/drivers/pwm/Kconfig.nrfx +++ b/drivers/pwm/Kconfig.nrfx @@ -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 || \ diff --git a/drivers/pwm/Kconfig.sam b/drivers/pwm/Kconfig.sam index 711f11bddc5..c2fb89bd097 100644 --- a/drivers/pwm/Kconfig.sam +++ b/drivers/pwm/Kconfig.sam @@ -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 diff --git a/drivers/sensor/opt3001/Kconfig b/drivers/sensor/opt3001/Kconfig index 0ebc21248fa..1a7a2b5fe04 100644 --- a/drivers/sensor/opt3001/Kconfig +++ b/drivers/sensor/opt3001/Kconfig @@ -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 diff --git a/drivers/sensor/qdec_nrfx/Kconfig b/drivers/sensor/qdec_nrfx/Kconfig index 57411c24617..2236e566291 100644 --- a/drivers/sensor/qdec_nrfx/Kconfig +++ b/drivers/sensor/qdec_nrfx/Kconfig @@ -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 diff --git a/drivers/sensor/si7060/Kconfig b/drivers/sensor/si7060/Kconfig index 9cfd3d62ffe..4f0b62bc186 100644 --- a/drivers/sensor/si7060/Kconfig +++ b/drivers/sensor/si7060/Kconfig @@ -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 diff --git a/drivers/sensor/ti_hdc/Kconfig b/drivers/sensor/ti_hdc/Kconfig index 61c4e6a387a..5fb57c4c2a1 100644 --- a/drivers/sensor/ti_hdc/Kconfig +++ b/drivers/sensor/ti_hdc/Kconfig @@ -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 diff --git a/drivers/sensor/tmp116/Kconfig b/drivers/sensor/tmp116/Kconfig index 2e06a07d3ac..4dd847e7aa0 100644 --- a/drivers/sensor/tmp116/Kconfig +++ b/drivers/sensor/tmp116/Kconfig @@ -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 diff --git a/drivers/serial/Kconfig.altera_jtag b/drivers/serial/Kconfig.altera_jtag index 643bff09e22..bc5e81fb84a 100644 --- a/drivers/serial/Kconfig.altera_jtag +++ b/drivers/serial/Kconfig.altera_jtag @@ -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 diff --git a/drivers/serial/Kconfig.cc32xx b/drivers/serial/Kconfig.cc32xx index ef33ae73d13..f2a13029ec1 100644 --- a/drivers/serial/Kconfig.cc32xx +++ b/drivers/serial/Kconfig.cc32xx @@ -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 diff --git a/drivers/serial/Kconfig.cmsdk_apb b/drivers/serial/Kconfig.cmsdk_apb index d44262dba2c..313b776ba29 100644 --- a/drivers/serial/Kconfig.cmsdk_apb +++ b/drivers/serial/Kconfig.cmsdk_apb @@ -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 diff --git a/drivers/serial/Kconfig.esp32 b/drivers/serial/Kconfig.esp32 index 2075c2cf3fa..066bbe1551b 100644 --- a/drivers/serial/Kconfig.esp32 +++ b/drivers/serial/Kconfig.esp32 @@ -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 diff --git a/drivers/serial/Kconfig.gecko b/drivers/serial/Kconfig.gecko index 2835d01a4a0..da7fcbad22e 100644 --- a/drivers/serial/Kconfig.gecko +++ b/drivers/serial/Kconfig.gecko @@ -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 diff --git a/drivers/serial/Kconfig.mcux b/drivers/serial/Kconfig.mcux index 7b9226eb866..55906703751 100644 --- a/drivers/serial/Kconfig.mcux +++ b/drivers/serial/Kconfig.mcux @@ -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. diff --git a/drivers/serial/Kconfig.mcux_lpc_usart b/drivers/serial/Kconfig.mcux_lpc_usart index 3dbbdc4e1d9..5bd7b86c33e 100644 --- a/drivers/serial/Kconfig.mcux_lpc_usart +++ b/drivers/serial/Kconfig.mcux_lpc_usart @@ -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. diff --git a/drivers/serial/Kconfig.mcux_lpsci b/drivers/serial/Kconfig.mcux_lpsci index bb3f968973d..48dce994275 100644 --- a/drivers/serial/Kconfig.mcux_lpsci +++ b/drivers/serial/Kconfig.mcux_lpsci @@ -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 diff --git a/drivers/serial/Kconfig.mcux_lpuart b/drivers/serial/Kconfig.mcux_lpuart index 2c5cf63e4aa..30520cc4f5f 100644 --- a/drivers/serial/Kconfig.mcux_lpuart +++ b/drivers/serial/Kconfig.mcux_lpuart @@ -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. diff --git a/drivers/serial/Kconfig.miv b/drivers/serial/Kconfig.miv index 535cd86b734..345e4a6ef8d 100644 --- a/drivers/serial/Kconfig.miv +++ b/drivers/serial/Kconfig.miv @@ -5,14 +5,14 @@ # Copyright (c) 2018 Antmicro # -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 diff --git a/drivers/serial/Kconfig.msp432p4xx b/drivers/serial/Kconfig.msp432p4xx index 86f14d7c32a..d2b098bf15c 100644 --- a/drivers/serial/Kconfig.msp432p4xx +++ b/drivers/serial/Kconfig.msp432p4xx @@ -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 diff --git a/drivers/serial/Kconfig.rv32m1_lpuart b/drivers/serial/Kconfig.rv32m1_lpuart index 02ba2021504..5bd77ee5d46 100644 --- a/drivers/serial/Kconfig.rv32m1_lpuart +++ b/drivers/serial/Kconfig.rv32m1_lpuart @@ -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 diff --git a/drivers/serial/Kconfig.sam0 b/drivers/serial/Kconfig.sam0 index ae4aa96eab2..504d7afbe5f 100644 --- a/drivers/serial/Kconfig.sam0 +++ b/drivers/serial/Kconfig.sam0 @@ -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 diff --git a/drivers/serial/Kconfig.stellaris b/drivers/serial/Kconfig.stellaris index 4cbfe3d6e5b..11dffff7188 100644 --- a/drivers/serial/Kconfig.stellaris +++ b/drivers/serial/Kconfig.stellaris @@ -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 diff --git a/drivers/serial/Kconfig.xlnx b/drivers/serial/Kconfig.xlnx index 8a8a21cb7d9..9e1896b61f9 100644 --- a/drivers/serial/Kconfig.xlnx +++ b/drivers/serial/Kconfig.xlnx @@ -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 diff --git a/drivers/spi/Kconfig.litex b/drivers/spi/Kconfig.litex index e7f2a89d146..9454d9e67e9 100644 --- a/drivers/spi/Kconfig.litex +++ b/drivers/spi/Kconfig.litex @@ -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 diff --git a/drivers/spi/Kconfig.mcux_dspi b/drivers/spi/Kconfig.mcux_dspi index dfe879d105f..28cc960ff57 100644 --- a/drivers/spi/Kconfig.mcux_dspi +++ b/drivers/spi/Kconfig.mcux_dspi @@ -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 diff --git a/drivers/spi/Kconfig.mcux_lpspi b/drivers/spi/Kconfig.mcux_lpspi index 08bfb0deca2..1ef8178194f 100644 --- a/drivers/spi/Kconfig.mcux_lpspi +++ b/drivers/spi/Kconfig.mcux_lpspi @@ -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 diff --git a/drivers/spi/Kconfig.sam0 b/drivers/spi/Kconfig.sam0 index 4d52e2442ef..102c0c31cb4 100644 --- a/drivers/spi/Kconfig.sam0 +++ b/drivers/spi/Kconfig.sam0 @@ -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 diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig index e9fb28e250d..ca470aa5cac 100644 --- a/drivers/timer/Kconfig +++ b/drivers/timer/Kconfig @@ -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 diff --git a/drivers/watchdog/Kconfig.mcux b/drivers/watchdog/Kconfig.mcux index e455acfd547..07e6b72955f 100644 --- a/drivers/watchdog/Kconfig.mcux +++ b/drivers/watchdog/Kconfig.mcux @@ -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 diff --git a/drivers/watchdog/Kconfig.nrfx b/drivers/watchdog/Kconfig.nrfx index cdf07093312..aa16679ea18 100644 --- a/drivers/watchdog/Kconfig.nrfx +++ b/drivers/watchdog/Kconfig.nrfx @@ -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 diff --git a/drivers/watchdog/Kconfig.sam b/drivers/watchdog/Kconfig.sam index b3a532806a2..3748fedf8cf 100644 --- a/drivers/watchdog/Kconfig.sam +++ b/drivers/watchdog/Kconfig.sam @@ -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 diff --git a/ext/hal/altera/Kconfig b/ext/hal/altera/Kconfig index 671e057618f..b1e78728b8e 100644 --- a/ext/hal/altera/Kconfig +++ b/ext/hal/altera/Kconfig @@ -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 diff --git a/modules/Kconfig.vega b/modules/Kconfig.vega index b981cb79509..4b891a6cad9 100644 --- a/modules/Kconfig.vega +++ b/modules/Kconfig.vega @@ -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