kconfig: Replace some single-symbol 'if's with 'depends on'

I think people might be reading differences into 'if' and 'depends on'
that aren't there, like maybe 'if' being needed to "hide" a symbol,
while 'depends on' just adds a dependency.

There are no differences between 'if' and 'depends on'. 'if' is just a
shorthand for 'depends on'. They work the same when it comes to creating
implicit menus too.

The way symbols get "hidden" is through their dependencies not being
satisfied ('if'/'depends on' get copied up as a dependency on the
prompt).

Since 'if' and 'depends on' are the same, an 'if' with just a single
symbol in it can be replaced with a 'depends on'. IMO, it's best to
avoid 'if' there as a style choice too, because it confuses people into
thinking there's deep Kconfig magic going on that requires 'if'.

Going for 'depends on' can also remove some nested 'if's, which
generates nicer symbol information and docs, because nested 'if's really
are so simple/dumb that they just add the dependencies from both 'if's
to all symbols within.

Replace a bunch of single-symbol 'if's with 'depends on' to despam the
Kconfig files a bit and make it clearer how things work. Also do some
other minor related dependency refactoring.

The replacement isn't complete. Will fix up the rest later. Splitting it
a bit to make it more manageable.

(Everything above is true for choices, menus, and comments as well.)

Detected by tweaking the Kconfiglib parsing code. It's impossible to
detect after parsing, because 'if' turns into 'depends on'.

Signed-off-by: Ulf Magnusson <[email protected]>

Author: ulfalizer

drivers/clock_control/Kconfig.nrf

@@ -10,11 +10,10 @@ config CLOCK_CONTROL_NRF_FORCE_ALT
 	  This option can be enabled to force an alternative implementation
 	  of the clock control driver.
 
-if !CLOCK_CONTROL_NRF_FORCE_ALT
-
 menuconfig CLOCK_CONTROL_NRF
 	bool "NRF Clock controller support"
 	depends on SOC_COMPATIBLE_NRF
+	depends on !CLOCK_CONTROL_NRF_FORCE_ALT
 	default y
 	help
 	  Enable support for the Nordic Semiconductor nRFxx series SoC clock
@@ -130,5 +129,3 @@ config CLOCK_CONTROL_NRF_K32SRC_20PPM
 endchoice
 
 endif # CLOCK_CONTROL_NRF
-
-endif #!CLOCK_CONTROL_NRF_FORCE_ALT

drivers/clock_control/Kconfig.stm32

@@ -4,17 +4,15 @@
 # Copyright (c) 2017 RnDity Sp. z o.o.
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_FAMILY_STM32
-
 menuconfig CLOCK_CONTROL_STM32_CUBE
 	bool "STM32 Reset & Clock Control"
+	depends on SOC_FAMILY_STM32
 	select USE_STM32_LL_UTILS
 	select USE_STM32_LL_RCC if SOC_SERIES_STM32MP1X
 	help
 	  Enable driver for Reset & Clock Control subsystem found
 	  in STM32 family of MCUs
 
-
 if CLOCK_CONTROL_STM32_CUBE
 
 config CLOCK_CONTROL_STM32_DEVICE_INIT_PRIORITY
@@ -274,4 +272,3 @@ config CLOCK_STM32_MCO2_DIV
 	  allowed values: 1, 2, 3, 4, 5
 
 endif # CLOCK_CONTROL_STM32_CUBE
-endif # SOC_FAMILY_STM32

drivers/counter/Kconfig.dtmr_cmsdk_apb

@@ -3,12 +3,9 @@
 # Copyright (c) 2016 Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_FAMILY_ARM
-
 config TIMER_DTMR_CMSDK_APB
 	bool "ARM CMSDK (Cortex-M System Design Kit) DTMR Timer driver"
+	depends on SOC_FAMILY_ARM
 	help
 	  The dualtimer (DTMR) present in the platform is used as a timer.
 	  This option enables the support for the timer.
-
-endif # SOC_FAMILY_ARM

drivers/counter/Kconfig.nrfx

@@ -51,24 +51,15 @@ config COUNTER_RTC2
 	select COUNTER_NRF_RTC
 
 # Internal flag which detects if PPI wrap feature is enabled for any instance
-if ($(dt_node_has_bool_prop,rtc-0,ppi-wrap) && COUNTER_RTC0) || \
-   ($(dt_node_has_bool_prop,rtc-1,ppi-wrap) && COUNTER_RTC1) || \
-   ($(dt_node_has_bool_prop,rtc-2,ppi-wrap) && COUNTER_RTC2)
-
 config COUNTER_RTC_WITH_PPI_WRAP
-	bool
-	default y
+	def_bool ($(dt_node_has_bool_prop,rtc-0,ppi-wrap) && COUNTER_RTC0) || \
+		 ($(dt_node_has_bool_prop,rtc-1,ppi-wrap) && COUNTER_RTC1) || \
+		 ($(dt_node_has_bool_prop,rtc-2,ppi-wrap) && COUNTER_RTC2)
 	select NRFX_PPI if HAS_HW_NRF_PPI
 	select NRFX_DPPI if HAS_HW_NRF_DPPIC
 
-endif
-
 # Internal flag which detects if fixed top feature is enabled for any instance
-if (!$(dt_node_has_bool_prop,rtc-0,fixed-top) && COUNTER_RTC0) || \
-   (!$(dt_node_has_bool_prop,rtc-1,fixed-top) && COUNTER_RTC1) || \
-   (!$(dt_node_has_bool_prop,rtc-2,fixed-top) && COUNTER_RTC2)
-
 config COUNTER_RTC_CUSTOM_TOP_SUPPORT
-	bool
-	default y
-endif
+	def_bool (!$(dt_node_has_bool_prop,rtc-0,fixed-top) && COUNTER_RTC0) || \
+		 (!$(dt_node_has_bool_prop,rtc-1,fixed-top) && COUNTER_RTC1) || \
+		 (!$(dt_node_has_bool_prop,rtc-2,fixed-top) && COUNTER_RTC2)

drivers/counter/Kconfig.tmr_cmsdk_apb

@@ -3,12 +3,9 @@
 # Copyright (c) 2016 Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_FAMILY_ARM
-
 config TIMER_TMR_CMSDK_APB
 	bool "ARM CMSDK (Cortex-M System Design Kit) Timer driver"
+	depends on SOC_FAMILY_ARM
 	help
 	  The timers (TMR) present in the platform are used as timers.
 	  This option enables the support for the timers.
-
-endif # SOC_FAMILY_ARM

drivers/crypto/Kconfig.stm32

@@ -11,13 +11,10 @@ menuconfig CRYPTO_STM32
 	help
 	  Enable STM32 HAL-based Cryptographic Accelerator driver.
 
-if CRYPTO_STM32
-
 config CRYPTO_STM32_MAX_SESSION
 	int "Maximum of sessions STM32 crypto driver can handle"
 	default 2
+	depends on CRYPTO_STM32
 	help
 	  This can be used to tweak the amount of sessions the driver
 	  can handle in parallel.
-
-endif # CRYPTO_STM32

drivers/display/Kconfig.microbit

@@ -12,15 +12,12 @@ config MICROBIT_DISPLAY
 	  Enable this to be able to display images and text on the 5x5
 	  LED matrix display on the BBC micro:bit.
 
-if MICROBIT_DISPLAY
-
 config MICROBIT_DISPLAY_STR_MAX
 	int "Maximum length of strings that can be shown on the display"
 	range 3 255
 	default 40
+	depends on MICROBIT_DISPLAY
 	help
 	  This value specifies the maximum length of strings that can
 	  be displayed using the mb_display_string() and mb_display_print()
 	  APIs.
-
-endif # MICROBIT_DISPLAY

drivers/display/Kconfig.st7789v

@@ -9,11 +9,10 @@ menuconfig ST7789V
 	help
 	  Enable driver for ST7789V display driver.
 
-if ST7789V
-
 choice ST7789V_PIXEL_FORMAT
 	prompt "Color pixel format"
 	default ST7789V_RGB565
+	depends on ST7789V
 	help
 	  Specify the color pixel format for the ST7789V display controller.
 
@@ -24,5 +23,3 @@ config ST7789V_RGB565
 	bool "RGB565"
 
 endchoice
-
-endif # ST7789V

drivers/eeprom/Kconfig

@@ -57,10 +57,9 @@ config EEPROM_SIMULATOR
 	help
 	  Enable Simulated EEPROM driver.
 
-if EEPROM_SIMULATOR
-
 config EEPROM_SIMULATOR_SIMULATE_TIMING
 	bool "Enable hardware timing simulation"
+	depends on EEPROM_SIMULATOR
 	help
 	  Enable Simulated hardware timing.
 
@@ -80,6 +79,4 @@ config EEPROM_SIMULATOR_MIN_WRITE_TIME_US
 
 endif # EEPROM_SIMULATOR_SIMULATE_TIMING
 
-endif # EEPROM_SIMULATOR
-
 endif # EEPROM

drivers/espi/Kconfig

@@ -40,19 +40,16 @@ config ESPI_VWIRE_CHANNEL
 	help
 	  eSPI Controller supports virtual wires channel.
 
-if ESPI_VWIRE_CHANNEL
-
 config ESPI_AUTOMATIC_WARNING_ACKNOWLEDGE
 	bool "Automatic acknowledge for eSPI HOST warnings"
 	default y
+	depends on ESPI_VWIRE_CHANNEL
 	help
 	  Enable automatic acknowledge from eSPI slave towards eSPI host
 	  whenever it receives suspend or reset warning.
 	  If this is disabled, it means the app wants to be give the opportunity
 	  to prepare for either HOST suspend or reset.
 
-endif # ESPI_VWIRE_CHANNEL
-
 config ESPI_OOB_CHANNEL
 	bool "eSPI Out-of-band channel"
 	help