michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kconfig: Replace defconfig singe-symbol 'if's with 'depends on'

Browse source 
Same deal as in commit eddd98f ("kconfig: Replace some single-symbol
'if's with 'depends on'"), for all symbols defined within defconfig
files. See that commit for an explanation.

Maybe 'if's were used originally to mirror the 'if's in the main Kconfig
files, and then it got copied around by people assuming 'if' must work
differently from 'depends on'. It doesn't match in every spot at least.
Better to keep it simple and just consistently use 'depends on' when
it's a single symbol/choice I think. Helps reinforce that 'if' isn't
magic too.

Verified by printing all Kconfig menu nodes (symbols, choices, menus,
etc.) before and after the change and diffing (should show no
difference).

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
This commit is contained in:
Ulf Magnusson 2020-02-10 04:18:50 +01:00 • committed by Kumar Gala
commit a42a42cd5a
272 changed files with 752 additions and 2949 deletions
Download patch file Download diff file Expand all files Collapse all files

50
soc/arm/st_stm32/common/Kconfig.defconfig.series
View file

@ -12,19 +12,13 @@ config CORTEX_M_SYSTICK
default n if STM32_LPTIM_TIMER
default y if !STM32_LPTIM_TIMER
if CLOCK_CONTROL
config CLOCK_CONTROL_STM32_CUBE
default y
endif # CLOCK_CONTROL
if SERIAL
depends on CLOCK_CONTROL
config UART_STM32
default y
endif # SERIAL
depends on SERIAL
if GPIO
@ -42,12 +36,9 @@ config GPIO_STM32_PORTC
endif # GPIO
if PINMUX
config PINMUX_STM32
default y
endif # PINMUX
depends on PINMUX
if WATCHDOG
@ -59,54 +50,33 @@ config WWDG_STM32
endif # WATCHDOG
if PWM
config PWM_STM32
default y
endif # PWM
if SPI
depends on PWM
config SPI_STM32
default y
endif # SPI
if I2C
depends on SPI
config I2C_STM32
default y
endif
if USB
depends on I2C
config USB_DC_STM32
default y
endif # USB
if COUNTER
depends on USB
config COUNTER_RTC_STM32
default y
endif # COUNTER
if CAN
depends on COUNTER
config CAN_STM32
default y
endif
if ADC
depends on CAN
config ADC_STM32
default y
endif # ADC
depends on ADC
if DMA

10
soc/arm/st_stm32/stm32f0/Kconfig.defconfig.series
View file

@ -24,18 +24,12 @@ config GPIO_STM32_PORTF
endif # GPIO_STM32
if I2C_STM32
config I2C_STM32_V2
default y
endif # I2C_STM32
if DMA_STM32
depends on I2C_STM32
config DMA_STM32_V2
default y
endif # DMA
depends on DMA_STM32
endif # SOC_SERIES_STM32F0X

15
soc/arm/st_stm32/stm32f1/Kconfig.defconfig.series
View file

@ -12,27 +12,18 @@ source "soc/arm/st_stm32/stm32f1/Kconfig.defconfig.stm32f1*"
config SOC_SERIES
default "stm32f1"
if GPIO_STM32
# GPIO ports A, B and C are set in ../common/Kconfig.defconfig.series
config GPIO_STM32_PORTD
default y
endif # GPIO_STM32
if I2C_STM32
depends on GPIO_STM32
config I2C_STM32_V1
default y
endif # I2C_STM32
if DMA_STM32
depends on I2C_STM32
config DMA_STM32_V2
default y
endif # DMA
depends on DMA_STM32
endif # SOC_SERIES_STM32F1X

5
soc/arm/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xx
View file

@ -11,12 +11,9 @@ config SOC
config NUM_IRQS
default 43
if GPIO_STM32
config GPIO_STM32_PORTE
default y
endif # GPIO_STM32
depends on GPIO_STM32
endif # SOC_STM32F103XB || SOC_STM32F103X8

5
soc/arm/st_stm32/stm32f1/Kconfig.defconfig.stm32f107xc
View file

@ -11,11 +11,8 @@ config SOC
config NUM_IRQS
default 68
if GPIO_STM32
config GPIO_STM32_PORTE
default y
endif # GPIO_STM32
depends on GPIO_STM32
endif # SOC_STM32F107XC

5
soc/arm/st_stm32/stm32f2/Kconfig.defconfig.series
View file

@ -36,11 +36,8 @@ config GPIO_STM32_PORTI
endif # GPIO_STM32
if DMA_STM32
config DMA_STM32_V1
default y
endif # DMA
depends on DMA_STM32
endif # SOC_SERIES_STM32F2X

15
soc/arm/st_stm32/stm32f3/Kconfig.defconfig.series
View file

@ -12,27 +12,18 @@ source "soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f3*"
config SOC_SERIES
default "stm32f3"
if GPIO_STM32
# GPIO ports A, B and C are set in ../common/Kconfig.defconfig.series
config GPIO_STM32_PORTD
default y
endif # GPIO_STM32
if I2C_STM32
depends on GPIO_STM32
config I2C_STM32_V2
default y
endif # I2C_STM32
if DMA_STM32
depends on I2C_STM32
config DMA_STM32_V2
default y
endif # DMA
depends on DMA_STM32
endif # SOC_SERIES_STM32F3X

5
soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f302x8
View file

@ -11,11 +11,8 @@ config SOC
config NUM_IRQS
default 82
if GPIO_STM32
config GPIO_STM32_PORTF
default y
endif # GPIO_STM32
depends on GPIO_STM32
endif # SOC_STM32F302X8

5
soc/arm/st_stm32/stm32f3/Kconfig.defconfig.stm32f334x8
View file

@ -11,11 +11,8 @@ config SOC
config NUM_IRQS
default 82
if GPIO_STM32
config GPIO_STM32_PORTF
default y
endif # GPIO_STM32
depends on GPIO_STM32
endif # SOC_STM32F334X8

10
soc/arm/st_stm32/stm32f4/Kconfig.defconfig.series
View file

@ -27,18 +27,12 @@ config GPIO_STM32_PORTH
endif # GPIO_STM32
if I2C_STM32
config I2C_STM32_V1
default y
endif # I2C_STM32
if DMA_STM32
depends on I2C_STM32
config DMA_STM32_V1
default y
endif # DMA
depends on DMA_STM32
endif # SOC_SERIES_STM32F4X

5
soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f405xx
View file

@ -24,11 +24,8 @@ config GPIO_STM32_PORTI
endif # GPIO_STM32
if ENTROPY_GENERATOR
config ENTROPY_STM32_RNG
default y
endif # ENTROPY_GENERATOR
depends on ENTROPY_GENERATOR
endif # SOC_STM32F405XG

5
soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f407xx
View file

@ -24,11 +24,8 @@ config GPIO_STM32_PORTI
endif # GPIO_STM32
if ENTROPY_GENERATOR
config ENTROPY_STM32_RNG
default y
endif # ENTROPY_GENERATOR
depends on ENTROPY_GENERATOR
endif # SOC_STM32F407XG

5
soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412cg
View file

@ -24,11 +24,8 @@ config GPIO_STM32_PORTH
endif # GPIO_STM32
if ENTROPY_GENERATOR
config ENTROPY_STM32_RNG
default y
endif # ENTROPY_GENERATOR
depends on ENTROPY_GENERATOR
endif # SOC_STM32F412CG

5
soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f412zg
View file

@ -21,11 +21,8 @@ config GPIO_STM32_PORTG
endif # GPIO_STM32
if ENTROPY_GENERATOR
config ENTROPY_STM32_RNG
default y
endif # ENTROPY_GENERATOR
depends on ENTROPY_GENERATOR
endif # SOC_STM32F412ZG

5
soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f413xx
View file

@ -21,11 +21,8 @@ config GPIO_STM32_PORTG
endif # GPIO_STM32
if ENTROPY_GENERATOR
config ENTROPY_STM32_RNG
default y
endif # ENTROPY_GENERATOR
depends on ENTROPY_GENERATOR
endif # SOC_STM32F413XX

5
soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f415xx
View file

@ -11,11 +11,8 @@ config SOC
config NUM_IRQS
default 82
if CRYPTO
config CRYPTO_STM32
default y
endif # CRYPTO
depends on CRYPTO
endif # SOC_STM32F415XX

10
soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f417xx
View file

@ -24,18 +24,12 @@ config GPIO_STM32_PORTI
endif # GPIO_STM32
if ENTROPY_GENERATOR
config ENTROPY_STM32_RNG
default y
endif # ENTROPY_GENERATOR
if CRYPTO
depends on ENTROPY_GENERATOR
config CRYPTO_STM32
default y
endif # CRYPTO
depends on CRYPTO
endif # SOC_STM32F417XX

5
soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f429xx
View file

@ -30,11 +30,8 @@ config GPIO_STM32_PORTK
endif # GPIO_STM32
if ENTROPY_GENERATOR
config ENTROPY_STM32_RNG
default y
endif # ENTROPY_GENERATOR
depends on ENTROPY_GENERATOR
endif # SOC_STM32F429XX

10
soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f437xx
View file

@ -30,18 +30,12 @@ config GPIO_STM32_PORTK
endif # GPIO_STM32
if ENTROPY_GENERATOR
config ENTROPY_STM32_RNG
default y
endif # ENTROPY_GENERATOR
if CRYPTO
depends on ENTROPY_GENERATOR
config CRYPTO_STM32
default y
endif # CRYPTO
depends on CRYPTO
endif # SOC_STM32F437XX

5
soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f469xx
View file

@ -30,11 +30,8 @@ config GPIO_STM32_PORTK
endif # GPIO_STM32
if ENTROPY_GENERATOR
config ENTROPY_STM32_RNG
default y
endif # ENTROPY_GENERATOR
depends on ENTROPY_GENERATOR
endif # SOC_STM32F469XX

15
soc/arm/st_stm32/stm32f7/Kconfig.defconfig.series
View file

@ -36,25 +36,16 @@ config GPIO_STM32_PORTI
endif # GPIO_STM32
if I2C_STM32
config I2C_STM32_V2
default y
endif # I2C_STM32
if ENTROPY_GENERATOR
depends on I2C_STM32
config ENTROPY_STM32_RNG
default y
endif # ENTROPY_GENERATOR
if DMA_STM32
depends on ENTROPY_GENERATOR
config DMA_STM32_V1
default y
endif # DMA
depends on DMA_STM32
endif # SOC_SERIES_STM32F7X

5
soc/arm/st_stm32/stm32g0/Kconfig.defconfig.series
View file

@ -21,12 +21,9 @@ config GPIO_STM32_PORTD
config GPIO_STM32_PORTF
default y
if I2C_STM32
config I2C_STM32_V2
default y
endif # I2C_STM32
depends on I2C_STM32
endif # GPIO_STM32

10
soc/arm/st_stm32/stm32g4/Kconfig.defconfig.series
View file

@ -26,19 +26,13 @@ config GPIO_STM32_PORTF
config GPIO_STM32_PORTG
default y
if I2C_STM32
config I2C_STM32_V2
default y
endif # I2C_STM32
if ENTROPY_GENERATOR
depends on I2C_STM32
config ENTROPY_STM32_RNG
default y
endif # ENTROPY_GENERATOR
depends on ENTROPY_GENERATOR
endif # GPIO_STM32
endif # SOC_SERIES_STM32G4X

10
soc/arm/st_stm32/stm32l0/Kconfig.defconfig.series
View file

@ -18,18 +18,12 @@ if GPIO_STM32
endif # GPIO_STM32
if I2C_STM32
config I2C_STM32_V2
default y
endif # I2C_STM32
if DMA_STM32
depends on I2C_STM32
config DMA_STM32_V2
default y
endif # DMA
depends on DMA_STM32
endif # SOC_SERIES_STM32L0X

5
soc/arm/st_stm32/stm32l1/Kconfig.defconfig.series
View file

@ -10,11 +10,8 @@ source "soc/arm/st_stm32/stm32l1/Kconfig.defconfig.stm32l1*"
config SOC_SERIES
default "stm32l1"
if I2C_STM32
config I2C_STM32_V1
default y
endif # I2C_STM32
depends on I2C_STM32
endif # SOC_SERIES_STM32L1X

20
soc/arm/st_stm32/stm32l4/Kconfig.defconfig.series
View file

@ -14,34 +14,22 @@ config SOC_SERIES
default "stm32l4"
if GPIO_STM32
# GPIO ports A, B and C are set in ../common/Kconfig.defconfig.series
config GPIO_STM32_PORTH
default y
endif # GPIO_STM32
if I2C_STM32
depends on GPIO_STM32
config I2C_STM32_V2
default y
endif # I2C_STM32
if ENTROPY_GENERATOR
depends on I2C_STM32
config ENTROPY_STM32_RNG
default y
endif # ENTROPY_GENERATOR
if DMA_STM32
depends on ENTROPY_GENERATOR
config DMA_STM32_V2
default y
endif # DMA
depends on DMA_STM32
endif # SOC_SERIES_STM32L4X

5
soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l432xx
View file

@ -12,11 +12,8 @@ config SOC
config NUM_IRQS
default 83
if GPIO_STM32
config GPIO_STM32_PORTH
default y
endif # GPIO_STM32
depends on GPIO_STM32
endif # SOC_STM32L432XX

10
soc/arm/st_stm32/stm32mp1/Kconfig.defconfig.series
View file

@ -38,18 +38,12 @@ config GPIO_STM32_PORTK
endif # GPIO_STM32
if IPM
config IPM_STM32_IPCC
default y
endif # IPM
if I2C_STM32
depends on IPM
config I2C_STM32_V2
default y
endif # I2C_STM32
depends on I2C_STM32
endif # SOC_SERIES_STM32MP1X

5
soc/arm/st_stm32/stm32wb/Kconfig.defconfig.series
View file

@ -23,11 +23,8 @@ config GPIO_STM32_PORTH
endif # GPIO_STM32
if I2C_STM32
config I2C_STM32_V2
default y
endif # I2C_STM32
depends on I2C_STM32
endif # SOC_SERIES_STM32WBX