patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

watchdog: remove Kconfig.defconfig setting of watchdog drivers

Browse source 
Now that watchdog drivers are enabled based on devicetree
we need to remove any cases of them getting enabled by
Kconfig.defconfig* files as this can lead to errors.

Typically the Kconfig.defconfig* will blindly enable a
watchdog and not respect the devicetree state of the watchdog.
Additionally we can get problems with prj.conf/defconfig
getting incorrectly overridden.

Signed-off-by: Kumar Gala <galak@kernel.org>
This commit is contained in:
Kumar Gala 2022-08-02 08:06:32 -05:00 committed by Maureen Helm
parent 3e2f30a7ef
commit 6298b27725
23 changed files with 0 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto_defconfig
View file

@ -10,7 +10,6 @@ CONFIG_SERIAL=y
CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_INTERRUPT_DRIVEN=y
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_WDT_SAM0=y
CONFIG_SOC_ATMEL_SAMD_XOSC32K=y CONFIG_SOC_ATMEL_SAMD_XOSC32K=y
CONFIG_SOC_ATMEL_SAMD_XOSC32K_AS_MAIN=y CONFIG_SOC_ATMEL_SAMD_XOSC32K_AS_MAIN=y
CONFIG_USE_DT_CODE_PARTITION=y CONFIG_USE_DT_CODE_PARTITION=y

1
boards/arm/atsamd20_xpro/atsamd20_xpro_defconfig
View file

@ -11,6 +11,5 @@ CONFIG_SERIAL=y
CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_INTERRUPT_DRIVEN=y
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_WDT_SAM0=y
CONFIG_SOC_ATMEL_SAMD_XOSC32K=y CONFIG_SOC_ATMEL_SAMD_XOSC32K=y
CONFIG_SOC_ATMEL_SAMD_XOSC32K_AS_MAIN=y CONFIG_SOC_ATMEL_SAMD_XOSC32K_AS_MAIN=y

1
boards/arm/atsamd21_xpro/atsamd21_xpro_defconfig
View file

@ -11,6 +11,5 @@ CONFIG_SERIAL=y
CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_INTERRUPT_DRIVEN=y
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_WDT_SAM0=y
CONFIG_SOC_ATMEL_SAMD_XOSC32K=y CONFIG_SOC_ATMEL_SAMD_XOSC32K=y
CONFIG_SOC_ATMEL_SAMD_XOSC32K_AS_MAIN=y CONFIG_SOC_ATMEL_SAMD_XOSC32K_AS_MAIN=y

1
boards/arm/atsame54_xpro/atsame54_xpro_defconfig
View file

@ -14,7 +14,6 @@ CONFIG_SERIAL=y
CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_INTERRUPT_DRIVEN=y
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_WDT_SAM0=y
# Enable HW stack protection # Enable HW stack protection
CONFIG_HW_STACK_PROTECTION=y CONFIG_HW_STACK_PROTECTION=y

1
boards/arm/atsamr21_xpro/atsamr21_xpro_defconfig
View file

@ -12,6 +12,5 @@ CONFIG_SERIAL=y
CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_INTERRUPT_DRIVEN=y
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_WDT_SAM0=y
CONFIG_SOC_ATMEL_SAMD_XOSC32K=y CONFIG_SOC_ATMEL_SAMD_XOSC32K=y
CONFIG_SOC_ATMEL_SAMD_XOSC32K_AS_MAIN=y CONFIG_SOC_ATMEL_SAMD_XOSC32K_AS_MAIN=y

4
boards/arm/mps2_an385/Kconfig.defconfig
View file

@ -13,10 +13,6 @@ config UART_INTERRUPT_DRIVEN
endif # SERIAL endif # SERIAL
config WDOG_CMSDK_APB
default y
depends on WATCHDOG
if COUNTER if COUNTER
config TIMER_TMR_CMSDK_APB config TIMER_TMR_CMSDK_APB

4
boards/arm/mps2_an521/Kconfig.defconfig
View file

@ -29,10 +29,6 @@ config UART_INTERRUPT_DRIVEN
endif # SERIAL endif # SERIAL
config WDOG_CMSDK_APB
default y
depends on WATCHDOG
if IPM if IPM
config IPM_MHU config IPM_MHU

4
boards/arm/v2m_beetle/Kconfig.defconfig
View file

@ -19,10 +19,6 @@ config UART_INTERRUPT_DRIVEN
endif # SERIAL endif # SERIAL
config WDOG_CMSDK_APB
default y
depends on WATCHDOG
if COUNTER if COUNTER
config TIMER_TMR_CMSDK_APB config TIMER_TMR_CMSDK_APB

3
soc/arm/atmel_sam0/common/Kconfig.defconfig.series
View file

@ -17,9 +17,6 @@ config HWINFO_SAM0
config USB_DC_SAM0 config USB_DC_SAM0
default USB_DEVICE_DRIVER default USB_DEVICE_DRIVER
config WDT_SAM0
default WATCHDOG
if USB_DEVICE_DRIVER if USB_DEVICE_DRIVER
config HEAP_MEM_POOL_SIZE config HEAP_MEM_POOL_SIZE

4
soc/arm/nuvoton_npcx/npcx7/Kconfig.defconfig.series
View file

@ -14,10 +14,6 @@ config NUM_IRQS
config CORTEX_M_SYSTICK config CORTEX_M_SYSTICK
default !NPCX_ITIM_TIMER default !NPCX_ITIM_TIMER
config WDT_NPCX
default y
depends on WATCHDOG
config ESPI_NPCX config ESPI_NPCX
default y default y
depends on ESPI depends on ESPI

4
soc/arm/nuvoton_npcx/npcx9/Kconfig.defconfig.series
View file

@ -14,10 +14,6 @@ config NUM_IRQS
config CORTEX_M_SYSTICK config CORTEX_M_SYSTICK
default !NPCX_ITIM_TIMER default !NPCX_ITIM_TIMER
config WDT_NPCX
default y
depends on WATCHDOG
config ESPI_NPCX config ESPI_NPCX
default y default y
depends on ESPI depends on ESPI

4
soc/arm/nxp_imx/rt/Kconfig.defconfig.series
View file

@ -70,10 +70,6 @@ config COUNTER_MCUX_GPT
endif # COUNTER endif # COUNTER
config WDT_MCUX_IMX_WDOG
default y
depends on WATCHDOG
config PM_MCUX_GPC config PM_MCUX_GPC
default y if HAS_MCUX_GPC default y if HAS_MCUX_GPC
depends on SOC_SERIES_IMX_RT11XX && PM depends on SOC_SERIES_IMX_RT11XX && PM

4
soc/arm/nxp_imx/rt5xx/Kconfig.defconfig.mimxrt595_cm33
View file

@ -20,10 +20,6 @@ config COUNTER_MCUX_CTIMER
default y default y
depends on COUNTER depends on COUNTER
config WDT_MCUX_WWDT
default y
depends on WATCHDOG
if MCUX_OS_TIMER if MCUX_OS_TIMER
config SYS_CLOCK_HW_CYCLES_PER_SEC config SYS_CLOCK_HW_CYCLES_PER_SEC

4
soc/arm/nxp_imx/rt6xx/Kconfig.defconfig.mimxrt685_cm33
View file

@ -43,10 +43,6 @@ config COUNTER_MCUX_LPC_RTC
default y default y
depends on COUNTER depends on COUNTER
config WDT_MCUX_WWDT
default y
depends on WATCHDOG
config USB_MCUX config USB_MCUX
default y default y
depends on USB_DEVICE_DRIVER depends on USB_DEVICE_DRIVER

4
soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.mk22f12
View file

@ -23,8 +23,4 @@ config USB_KINETIS
default y default y
depends on USB_DEVICE_DRIVER depends on USB_DEVICE_DRIVER
config WDT_MCUX_WDOG
default y
depends on WATCHDOG
endif # SOC_MK22F12 endif # SOC_MK22F12

4
soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12
View file

@ -38,10 +38,6 @@ config USB_KINETIS
default y default y
depends on USB_DEVICE_DRIVER depends on USB_DEVICE_DRIVER
config WDT_MCUX_WDOG
default y
depends on WATCHDOG
config COUNTER_MCUX_RTC config COUNTER_MCUX_RTC
default y default y
depends on COUNTER depends on COUNTER

4
soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk66f18
View file

@ -35,10 +35,6 @@ config USB_KINETIS
default y default y
depends on USB_DEVICE_DRIVER depends on USB_DEVICE_DRIVER
config WDT_MCUX_WDOG
default y
depends on WATCHDOG
config COUNTER_MCUX_RTC config COUNTER_MCUX_RTC
default y default y
depends on COUNTER depends on COUNTER

4
soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.series
View file

@ -34,10 +34,6 @@ config USB_KINETIS
default y default y
depends on USB_DEVICE_DRIVER depends on USB_DEVICE_DRIVER
config WDT_MCUX_WDOG
default y
depends on WATCHDOG
config COUNTER_MCUX_PIT config COUNTER_MCUX_PIT
default y if HAS_MCUX_PIT default y if HAS_MCUX_PIT
depends on COUNTER depends on COUNTER

4
soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.series
View file

@ -29,10 +29,6 @@ config KINETIS_FLASH_CONFIG_FOPT
default 0x7d default 0x7d
depends on KINETIS_FLASH_CONFIG depends on KINETIS_FLASH_CONFIG
config WDT_MCUX_WDOG32
default y
depends on WATCHDOG
if COUNTER if COUNTER
config COUNTER_MCUX_RTC config COUNTER_MCUX_RTC

4
soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw2xd512
View file

@ -31,8 +31,4 @@ config USB_KINETIS
default y default y
depends on USB_DEVICE_DRIVER depends on USB_DEVICE_DRIVER
config WDT_MCUX_WDOG
default y
depends on WATCHDOG
endif # SOC_MKW2xD512 endif # SOC_MKW2xD512

4
soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S28
View file

@ -16,10 +16,6 @@ config SOC_FLASH_MCUX
default y default y
depends on FLASH depends on FLASH
config WDT_MCUX_WWDT
default y
depends on WATCHDOG
config DMA_MCUX_LPC config DMA_MCUX_LPC
default y default y
depends on DMA depends on DMA

4
soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S69_cpu0
View file

@ -17,10 +17,6 @@ config SOC_FLASH_MCUX
depends on FLASH depends on FLASH
depends on !TRUSTED_EXECUTION_NONSECURE depends on !TRUSTED_EXECUTION_NONSECURE
config WDT_MCUX_WWDT
default y
depends on WATCHDOG
config DMA_MCUX_LPC config DMA_MCUX_LPC
default y default y
depends on DMA depends on DMA

4
soc/riscv/riscv-ite/it8xxx2/Kconfig.defconfig.series
View file

@ -35,10 +35,6 @@ config UART_NS16550_WA_ISR_REENABLE_INTERRUPT
config RISCV_HAS_CPU_IDLE config RISCV_HAS_CPU_IDLE
default y default y
config WDT_ITE_IT8XXX2
default y
depends on WATCHDOG
config KSCAN_ITE_IT8XXX2 config KSCAN_ITE_IT8XXX2
default y default y
depends on KSCAN depends on KSCAN