kconfig: Remove symbol types from Kconfig.defconfig files

Same deal as in commit 7fdb525754 ("kconfig: Use 'default' instead of
'def_bool' in Kconfig.defconfig files"), but I hacked Kconfiglib to also
find cases where the type is given separately as e.g.

    config FOO
            int
            default 3

Motivation (from a note in
https://docs.zephyrproject.org/latest/guides/kconfig/index.html):

    For a symbol defined in multiple locations (e.g., in a
    Kconfig.defconfig file in Zephyr), it is best to only give the
    symbol type for the "base" definition of the symbol, and to use
    'default' (instead of 'def_<type>' value) for the remaining
    definitions. That way, if the base definition of the symbol is
    removed, the symbol ends up without a type, which generates a
    warning that points to the other definitions. That makes the extra
    definitions easier to discover and remove.

It's also nice if 'def_bool' and the like turn into a semi-reliable flag
that the symbol is only defined in Kconfig.defconfig files. That might
be a sign that things could be cleaned up.

Will do a separate pass later to remove some symbols only defined in
Kconfig.defconfig files.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
This commit is contained in:
Ulf Magnusson 2019-10-24 08:13:13 +02:00 committed by Maureen Helm
commit 2b61031c8f
134 changed files with 27 additions and 197 deletions

View file

@ -25,7 +25,6 @@ endmenu
menu "Nios II Family Options"
config XIP
bool
default y
config GEN_ISR_TABLES

View file

@ -27,7 +27,7 @@ config SIMULATOR_XTENSA
Specify if the board configuration should be treated as a simulator.
config SYS_CLOCK_HW_CYCLES_PER_SEC
int "Hardware clock cycles per second, 2000000 for ISS"
prompt "Hardware clock cycles per second, 2000000 for ISS"
default 2000000
range 1000000 1000000000
help

View file

@ -11,7 +11,7 @@ config BOARD
if UART_NS16550
config UART_NS16550_PORT_1
def_bool y if UART_CONSOLE
default y if UART_CONSOLE
endif

View file

@ -11,7 +11,7 @@ config BOARD
if UART_NS16550
config UART_NS16550_PORT_2
def_bool y if UART_CONSOLE
default y if UART_CONSOLE
endif

View file

@ -23,19 +23,19 @@ endif # !TRUSTED_EXECUTION_NONSECURE
if GPIO
config GPIO_CMSDK_AHB
def_bool y
default y
config GPIO_CMSDK_AHB_PORT0
def_bool y
default y
config GPIO_CMSDK_AHB_PORT1
def_bool y
default y
config GPIO_CMSDK_AHB_PORT2
def_bool y
default y
config GPIO_CMSDK_AHB_PORT3
def_bool y
default y
endif # GPIO
@ -49,17 +49,17 @@ endif # PINMUX
if SERIAL
config UART_CMSDK_APB
def_bool y
default y
config UART_INTERRUPT_DRIVEN
def_bool y
default y
endif # SERIAL
if WATCHDOG
config WDOG_CMSDK_APB
def_bool y
default y
endif # WATCHDOG
@ -88,7 +88,7 @@ endif # COUNTER
if I2C
config I2C_SBCON
def_bool y
default y
endif # I2C

View file

@ -28,15 +28,12 @@ config NRF_RTC_TIMER
endif # SYS_CLOCK_EXISTS
config SYS_CLOCK_HW_CYCLES_PER_SEC
int
default 1000000
config SYS_CLOCK_TICKS_PER_SEC
int
default 100
config ENTROPY_NRF_FORCE_ALT
bool
default y
endif # BOARD_QEMU_CORTEX_M0

View file

@ -7,7 +7,6 @@
if BOARD_SAM4S_XPLAINED
config BOARD
string
default "sam4s_xplained"
if I2C

View file

@ -7,7 +7,6 @@
if BOARD_SAM_E70_XPLAINED
config BOARD
string
default "sam_e70_xplained"
if I2S
@ -28,23 +27,18 @@ choice ETH_SAM_GMAC_MAC_SELECT
endchoice
config ETH_SAM_GMAC_MAC_I2C_SLAVE_ADDRESS
hex
default 0x5F
config ETH_SAM_GMAC_MAC_I2C_INT_ADDRESS
hex
default 0x9A
config ETH_SAM_GMAC_MAC_I2C_INT_ADDRESS_SIZE
int
default 1
config ETH_SAM_GMAC_MAC_I2C_DEV_NAME
string
default "I2C_0"
config ETH_SAM_GMAC_MAC_I2C_EEPROM
bool
select I2C
endif # ETH_SAM_GMAC

View file

@ -38,7 +38,7 @@ config CLOCK_STM32_D3PPRE
default 2
config STM32H7_DUAL_CORE
def_bool y
default y
# Dual core boot configuration
if STM32H7_DUAL_CORE

View file

@ -33,16 +33,16 @@ endif
if SERIAL
config UART_PL011
def_bool y
default y
config UART_INTERRUPT_DRIVEN
def_bool y
default y
config UART_PL011_PORT0
def_bool y
default y
config UART_PL011_PORT1
def_bool y
default y
endif # SERIAL

View file

@ -61,10 +61,10 @@ endif # SERIAL
if I2C
config I2C_0
def_bool y
default y
config I2C_3
def_bool y if RV32M1_INTMUX
default y if RV32M1_INTMUX
endif # I2C

View file

@ -17,7 +17,7 @@ menuconfig ADC_STM32
if ADC_STM32
config ADC_1
bool "ADC1"
prompt "ADC1"
default y
help
Enable ADC1

View file

@ -7,7 +7,6 @@
if SOC_ARC_HSDK
config SOC
string
default "snps_arc_hsdk"
config CPU_HS38_LINUX

View file

@ -8,7 +8,6 @@
if SOC_ARC_IOT
config SOC
string
default "snps_arc_iot"
config CPU_EM4_FPUS

View file

@ -7,7 +7,6 @@
if SOC_ARC_EMSDP
config SOC
string
default "snps_emsdp"
config NUM_IRQ_PRIO_LEVELS

View file

@ -8,7 +8,6 @@
if SOC_EMSK
config SOC
string
default "snps_emsk"
source "soc/arc/snps_emsk/Kconfig.defconfig.em7d"

View file

@ -7,11 +7,9 @@
if SOC_NSIM
config SOC
string
default "snps_nsim"
config UART_CONSOLE_ON_DEV_NAME
string
default "UART_0"
source "soc/arc/snps_nsim/Kconfig.defconfig.em"

View file

@ -18,7 +18,6 @@ config NUM_IRQS
default 45
config SYS_CLOCK_HW_CYCLES_PER_SEC
int
default 24000000
endif # SOC_SERIES_BEETLE

View file

@ -10,7 +10,6 @@ config SOC_SERIES
default "mps2"
config SYS_CLOCK_HW_CYCLES_PER_SEC
int
default 25000000
source "soc/arm/arm/mps2/Kconfig.defconfig.mps2*"

View file

@ -10,7 +10,6 @@ config SOC_SERIES
default "musca_a"
config SYS_CLOCK_HW_CYCLES_PER_SEC
int
default 50000000
source "soc/arm/arm/musca_a/Kconfig.defconfig.musca_a"

View file

@ -10,7 +10,6 @@ config SOC_SERIES
default "musca_b1"
config SYS_CLOCK_HW_CYCLES_PER_SEC
int
default 40000000
source "soc/arm/arm/musca_b1/Kconfig.defconfig.musca_b1"

View file

@ -29,7 +29,6 @@ config NUM_IRQS
default 45
config SYS_CLOCK_HW_CYCLES_PER_SEC
int
default 84000000
endif # SOC_SERIES_SAM3X

View file

@ -34,7 +34,6 @@ config NUM_IRQS
default 35
config SYS_CLOCK_HW_CYCLES_PER_SEC
int
default 120000000
endif # SOC_SERIES_SAM4S

View file

@ -42,7 +42,6 @@ config NUM_IRQS
default 71
config SYS_CLOCK_HW_CYCLES_PER_SEC
int
default 300000000
# Configure default device drivers. If a feature is supported by more than one

View file

@ -34,7 +34,6 @@ config NUM_IRQS
default 25
config SYS_CLOCK_HW_CYCLES_PER_SEC
int
default 48000000
endif # SOC_SERIES_SAMD20

View file

@ -31,7 +31,6 @@ config NUM_IRQS
default 29
config SYS_CLOCK_HW_CYCLES_PER_SEC
int
default 48000000
endif # SOC_SERIES_SAMD21

View file

@ -24,7 +24,6 @@ config NUM_IRQS
default 28
config SYS_CLOCK_HW_CYCLES_PER_SEC
int
default 48000000
endif # SOC_SERIES_SAMR21

View file

@ -8,7 +8,6 @@
if SOC_PSOC6_M0
config SOC
string
default "psoc6_m0"
if SERIAL

View file

@ -8,7 +8,6 @@
if SOC_PSOC6_M4
config SOC
string
default "psoc6_m4"
if SERIAL

View file

@ -21,7 +21,6 @@ config NUM_IRQS
default 40
config SYS_CLOCK_HW_CYCLES_PER_SEC
int
default 50000000
source "soc/arm/cypress/psoc6/Kconfig.defconfig.psoc*"

View file

@ -8,13 +8,12 @@
if SOC_MEC1501_HSZ
config SOC
string
default "mec1501hsz"
if SERIAL
config UART_NS16550
def_bool y
default y
endif # SERIAL
@ -45,14 +44,14 @@ endif # GPIO
if I2C
config I2C_XEC
def_bool y
default y
endif # I2C
if COUNTER
config COUNTER_XEC
def_bool y
default y
endif # COUNTER
@ -66,7 +65,7 @@ endif # PS2
if PWM
config PWM_XEC
def_bool y
default y
endif # PWM
@ -80,7 +79,7 @@ endif # KSCAN
if SPI
config SPI_XEC_QMSPI
def_bool y
default y
endif # SPI

View file

@ -23,7 +23,6 @@ source "soc/arm/microchip_mec/mec1501/Kconfig.defconfig.mec1501*"
if RTOS_TIMER
config MCHP_XEC_RTOS_TIMER
bool
default y
config ARCH_HAS_CUSTOM_BUSY_WAIT

View file

@ -8,11 +8,9 @@
if SOC_MEC1701_QSZ
config SOC
string
default "mec1701qsz"
config SYS_CLOCK_HW_CYCLES_PER_SEC
int
default 48000000
if SERIAL

View file

@ -19,11 +19,9 @@ config NRF_RTC_TIMER
endif # SYS_CLOCK_EXISTS
config SYS_CLOCK_HW_CYCLES_PER_SEC
int
default 32768
config SYS_CLOCK_TICKS_PER_SEC
int
default 32768
config ARCH_HAS_CUSTOM_BUSY_WAIT

View file

@ -9,7 +9,6 @@
if SOC_NRF51822_QFAA
config SOC
string
default "nRF51822_QFAA"
config ISR_STACK_SIZE

View file

@ -9,7 +9,6 @@
if SOC_NRF51822_QFAB
config SOC
string
default "nRF51822_QFAB"
config ISR_STACK_SIZE

View file

@ -9,7 +9,6 @@
if SOC_NRF51822_QFAC
config SOC
string
default "nRF51822_QFAC"
endif # SOC_NRF51822_QFAC

View file

@ -9,7 +9,6 @@
if SOC_NRF52810_QFAA
config SOC
string
default "nRF52810_QFAA"
config NUM_IRQS

View file

@ -9,7 +9,6 @@
if SOC_NRF52811_QFAA
config SOC
string
default "nRF52811_QFAA"
config NUM_IRQS

View file

@ -9,7 +9,6 @@
if SOC_NRF52832_CIAA
config SOC
string
default "nRF52832_CIAA"
config NUM_IRQS

View file

@ -9,7 +9,6 @@
if SOC_NRF52832_QFAA
config SOC
string
default "nRF52832_QFAA"
config NUM_IRQS

View file

@ -9,7 +9,6 @@
if SOC_NRF52832_QFAB
config SOC
string
default "nRF52832_QFAB"
config NUM_IRQS

View file

@ -9,7 +9,6 @@
if SOC_NRF52840_QIAA
config SOC
string
default "nRF52840_QIAA"
config NUM_IRQS

View file

@ -9,7 +9,6 @@
if SOC_NRF9160_SICA
config SOC
string
default "nRF9160_SICA"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_MCIMX6X_M4
config SOC
string
default "mcimx6x"
config FLOAT

View file

@ -8,11 +8,9 @@
if SOC_MCIMX7_M4
config SOC
string
default "mcimx7d"
config SYS_CLOCK_HW_CYCLES_PER_SEC
int
default 200000000
if CLOCK_CONTROL

View file

@ -8,7 +8,6 @@
if SOC_MIMXRT1015
config SOC
string
default "mimxrt1015"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_MIMXRT1021
config SOC
string
default "mimxrt1021"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_MIMXRT1052
config SOC
string
default "mimxrt1052"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_MIMXRT1062
config SOC
string
default "mimxrt1062"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_MIMXRT1064
config SOC
string
default "mimxrt1064"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_MK22F51212
config SOC
string
default "mk22f51212"
if ADC

View file

@ -9,7 +9,6 @@
if SOC_MK64F12
config SOC
string
default "mk64f12"
if ADC

View file

@ -8,7 +8,6 @@
if SOC_MK80F25615
config SOC
string
default "mk80f25615"
endif # SOC_MK80F25615

View file

@ -8,7 +8,6 @@
if SOC_MK82F25615
config SOC
string
default "mk82f25615"
endif # SOC_MK82F25615

View file

@ -8,7 +8,6 @@
if SOC_MKE14F16
config SOC
string
default "mke14f16"
endif # SOC_MKE14F16

View file

@ -8,7 +8,6 @@
if SOC_MKE16F16
config SOC
string
default "mke16f16"
if CAN

View file

@ -8,7 +8,6 @@
if SOC_MKE18F16
config SOC
string
default "mke18f16"
if CAN

View file

@ -8,7 +8,6 @@
if SOC_MKL25Z4
config SOC
string
default "mkl25z4"
config NUM_IRQS

View file

@ -10,7 +10,6 @@ if SOC_MKW22D5 || SOC_MKW24D5
if SOC_MKW22D5
config SOC
string
default "mkw22d5"
endif # SOC_MKW22D5
@ -18,7 +17,6 @@ endif # SOC_MKW22D5
if SOC_MKW24D5
config SOC
string
default "mkw24d5"
endif # SOC_MKW24D5

View file

@ -8,7 +8,6 @@
if SOC_MKW40Z4
config SOC
string
default "mkw40z4"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_MKW41Z4
config SOC
string
default "mkw41z4"
config NUM_IRQS

View file

@ -9,7 +9,6 @@
if SOC_LPC54114_M0
config SOC
string
default "lpc54114_m0"
if PINMUX

View file

@ -8,7 +8,6 @@
if SOC_LPC54114_M4
config SOC
string
default "lpc54114"
if PINMUX

View file

@ -8,7 +8,6 @@
if SOC_LPC55S69_CPU0
config SOC
string
default "lpc55S69_cpu0"
if PINMUX

View file

@ -8,7 +8,6 @@
if SOC_LPC55S69_CPU1
config SOC
string
default "lpc55S69_cpu1"
if PINMUX

View file

@ -9,7 +9,6 @@ if SOC_STM32F030X4
# STM32F0 Cube package advises to use 'stm32f030x6' code
# for both STM32F030x4 and STM32F030x6 SoC variants.
config SOC
string
default "stm32f030x6"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F030X8
config SOC
string
default "stm32f030x8"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F051X8
config SOC
string
default "stm32f051x8"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F070XB
config SOC
string
default "stm32f070xb"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F072XB
config SOC
string
default "stm32f072xb"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F091XC
config SOC
string
default "stm32f091xc"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F103XB || SOC_STM32F103X8
config SOC
string
default "stm32f103xb"
config NUM_IRQS
@ -27,7 +26,6 @@ endif # SOC_STM32F103XB || SOC_STM32F103X8
if SOC_STM32F103XE
config SOC
string
default "stm32f103xe"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F107XC
config SOC
string
default "stm32f107xc"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F207XX
config SOC
string
default "STM32F207xx"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F302X8
config SOC
string
default "stm32f302x8"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F303XC
config SOC
string
default "stm32f303xc"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F334X8
config SOC
string
default "stm32f334x8"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F373XC
config SOC
string
default "stm32f373xc"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F401XC
config SOC
string
default "stm32f401xc"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F401XE
config SOC
string
default "stm32f401xe"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F405XG
config SOC
string
default "stm32f405xx"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F407XG
config SOC
string
default "stm32f407xx"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F411XE
config SOC
string
default "stm32f411xe"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F412CG
config SOC
string
default "stm32f412cx"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F412ZG
config SOC
string
default "stm32f412zx"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F413XX
config SOC
string
default "stm32f413xx"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F415XX
config SOC
string
default "stm32f415xx"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F417XX
config SOC
string
default "stm32f417xx"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F429XX
config SOC
string
default "stm32f429xx"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F437XX
config SOC
string
default "stm32f437xx"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F446XX
config SOC
string
default "stm32f446xx"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F469XX
config SOC
string
default "stm32f469xx"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F723XX
config SOC
string
default "stm32f723xx"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32F746XX
config SOC
string
default "stm32f746xx"
if GPIO_STM32

View file

@ -8,7 +8,6 @@
if SOC_STM32F756XX
config SOC
string
default "stm32f756xx"
if GPIO_STM32

View file

@ -8,7 +8,6 @@
if SOC_STM32F769XX
config SOC
string
default "stm32f769xx"
if GPIO_STM32

View file

@ -9,7 +9,6 @@
if SOC_STM32G071XX
config SOC
string
default "stm32g071xx"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32G431XX
config SOC
string
default "stm32g431xx"
config NUM_IRQS

View file

@ -8,7 +8,6 @@
if SOC_STM32H747XX
config SOC
string
default "stm32h747xx"
config NUM_IRQS

Some files were not shown because too many files have changed in this diff Show more