From 6298b27725c7e69c8b7659d05d5ed819dd0a25a9 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 2 Aug 2022 08:06:32 -0500 Subject: [PATCH] watchdog: remove Kconfig.defconfig setting of watchdog drivers 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 --- .../adafruit_feather_m0_basic_proto_defconfig | 1 - boards/arm/atsamd20_xpro/atsamd20_xpro_defconfig | 1 - boards/arm/atsamd21_xpro/atsamd21_xpro_defconfig | 1 - boards/arm/atsame54_xpro/atsame54_xpro_defconfig | 1 - boards/arm/atsamr21_xpro/atsamr21_xpro_defconfig | 1 - boards/arm/mps2_an385/Kconfig.defconfig | 4 ---- boards/arm/mps2_an521/Kconfig.defconfig | 4 ---- boards/arm/v2m_beetle/Kconfig.defconfig | 4 ---- soc/arm/atmel_sam0/common/Kconfig.defconfig.series | 3 --- soc/arm/nuvoton_npcx/npcx7/Kconfig.defconfig.series | 4 ---- soc/arm/nuvoton_npcx/npcx9/Kconfig.defconfig.series | 4 ---- soc/arm/nxp_imx/rt/Kconfig.defconfig.series | 4 ---- soc/arm/nxp_imx/rt5xx/Kconfig.defconfig.mimxrt595_cm33 | 4 ---- soc/arm/nxp_imx/rt6xx/Kconfig.defconfig.mimxrt685_cm33 | 4 ---- soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.mk22f12 | 4 ---- soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 | 4 ---- soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk66f18 | 4 ---- soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.series | 4 ---- soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.series | 4 ---- soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw2xd512 | 4 ---- soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S28 | 4 ---- soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S69_cpu0 | 4 ---- soc/riscv/riscv-ite/it8xxx2/Kconfig.defconfig.series | 4 ---- 23 files changed, 76 deletions(-) diff --git a/boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto_defconfig b/boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto_defconfig index a1be6d76af4..6fad7bffb11 100644 --- a/boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto_defconfig +++ b/boards/arm/adafruit_feather_m0_basic_proto/adafruit_feather_m0_basic_proto_defconfig @@ -10,7 +10,6 @@ CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_GPIO=y CONFIG_WATCHDOG=y -CONFIG_WDT_SAM0=y CONFIG_SOC_ATMEL_SAMD_XOSC32K=y CONFIG_SOC_ATMEL_SAMD_XOSC32K_AS_MAIN=y CONFIG_USE_DT_CODE_PARTITION=y diff --git a/boards/arm/atsamd20_xpro/atsamd20_xpro_defconfig b/boards/arm/atsamd20_xpro/atsamd20_xpro_defconfig index 64f03240af6..31aabda59e0 100644 --- a/boards/arm/atsamd20_xpro/atsamd20_xpro_defconfig +++ b/boards/arm/atsamd20_xpro/atsamd20_xpro_defconfig @@ -11,6 +11,5 @@ CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_GPIO=y CONFIG_WATCHDOG=y -CONFIG_WDT_SAM0=y CONFIG_SOC_ATMEL_SAMD_XOSC32K=y CONFIG_SOC_ATMEL_SAMD_XOSC32K_AS_MAIN=y diff --git a/boards/arm/atsamd21_xpro/atsamd21_xpro_defconfig b/boards/arm/atsamd21_xpro/atsamd21_xpro_defconfig index 46f7d38e911..307ab0f80d7 100644 --- a/boards/arm/atsamd21_xpro/atsamd21_xpro_defconfig +++ b/boards/arm/atsamd21_xpro/atsamd21_xpro_defconfig @@ -11,6 +11,5 @@ CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_GPIO=y CONFIG_WATCHDOG=y -CONFIG_WDT_SAM0=y CONFIG_SOC_ATMEL_SAMD_XOSC32K=y CONFIG_SOC_ATMEL_SAMD_XOSC32K_AS_MAIN=y diff --git a/boards/arm/atsame54_xpro/atsame54_xpro_defconfig b/boards/arm/atsame54_xpro/atsame54_xpro_defconfig index 7f30ab63ed8..be55042bcef 100644 --- a/boards/arm/atsame54_xpro/atsame54_xpro_defconfig +++ b/boards/arm/atsame54_xpro/atsame54_xpro_defconfig @@ -14,7 +14,6 @@ CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_GPIO=y CONFIG_WATCHDOG=y -CONFIG_WDT_SAM0=y # Enable HW stack protection CONFIG_HW_STACK_PROTECTION=y diff --git a/boards/arm/atsamr21_xpro/atsamr21_xpro_defconfig b/boards/arm/atsamr21_xpro/atsamr21_xpro_defconfig index 64452c4281d..15e4400dc1d 100644 --- a/boards/arm/atsamr21_xpro/atsamr21_xpro_defconfig +++ b/boards/arm/atsamr21_xpro/atsamr21_xpro_defconfig @@ -12,6 +12,5 @@ CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_GPIO=y CONFIG_WATCHDOG=y -CONFIG_WDT_SAM0=y CONFIG_SOC_ATMEL_SAMD_XOSC32K=y CONFIG_SOC_ATMEL_SAMD_XOSC32K_AS_MAIN=y diff --git a/boards/arm/mps2_an385/Kconfig.defconfig b/boards/arm/mps2_an385/Kconfig.defconfig index d5e50b78010..fbf735f0526 100644 --- a/boards/arm/mps2_an385/Kconfig.defconfig +++ b/boards/arm/mps2_an385/Kconfig.defconfig @@ -13,10 +13,6 @@ config UART_INTERRUPT_DRIVEN endif # SERIAL -config WDOG_CMSDK_APB - default y - depends on WATCHDOG - if COUNTER config TIMER_TMR_CMSDK_APB diff --git a/boards/arm/mps2_an521/Kconfig.defconfig b/boards/arm/mps2_an521/Kconfig.defconfig index 165a7e6215e..29c97bf30be 100644 --- a/boards/arm/mps2_an521/Kconfig.defconfig +++ b/boards/arm/mps2_an521/Kconfig.defconfig @@ -29,10 +29,6 @@ config UART_INTERRUPT_DRIVEN endif # SERIAL -config WDOG_CMSDK_APB - default y - depends on WATCHDOG - if IPM config IPM_MHU diff --git a/boards/arm/v2m_beetle/Kconfig.defconfig b/boards/arm/v2m_beetle/Kconfig.defconfig index ac9e016abc1..595080f408c 100644 --- a/boards/arm/v2m_beetle/Kconfig.defconfig +++ b/boards/arm/v2m_beetle/Kconfig.defconfig @@ -19,10 +19,6 @@ config UART_INTERRUPT_DRIVEN endif # SERIAL -config WDOG_CMSDK_APB - default y - depends on WATCHDOG - if COUNTER config TIMER_TMR_CMSDK_APB diff --git a/soc/arm/atmel_sam0/common/Kconfig.defconfig.series b/soc/arm/atmel_sam0/common/Kconfig.defconfig.series index 41a124c823e..c8d9337890e 100644 --- a/soc/arm/atmel_sam0/common/Kconfig.defconfig.series +++ b/soc/arm/atmel_sam0/common/Kconfig.defconfig.series @@ -17,9 +17,6 @@ config HWINFO_SAM0 config USB_DC_SAM0 default USB_DEVICE_DRIVER -config WDT_SAM0 - default WATCHDOG - if USB_DEVICE_DRIVER config HEAP_MEM_POOL_SIZE diff --git a/soc/arm/nuvoton_npcx/npcx7/Kconfig.defconfig.series b/soc/arm/nuvoton_npcx/npcx7/Kconfig.defconfig.series index 57316baf6a0..4af311aebcb 100644 --- a/soc/arm/nuvoton_npcx/npcx7/Kconfig.defconfig.series +++ b/soc/arm/nuvoton_npcx/npcx7/Kconfig.defconfig.series @@ -14,10 +14,6 @@ config NUM_IRQS config CORTEX_M_SYSTICK default !NPCX_ITIM_TIMER -config WDT_NPCX - default y - depends on WATCHDOG - config ESPI_NPCX default y depends on ESPI diff --git a/soc/arm/nuvoton_npcx/npcx9/Kconfig.defconfig.series b/soc/arm/nuvoton_npcx/npcx9/Kconfig.defconfig.series index e252c7a1dac..b5ffb594eed 100644 --- a/soc/arm/nuvoton_npcx/npcx9/Kconfig.defconfig.series +++ b/soc/arm/nuvoton_npcx/npcx9/Kconfig.defconfig.series @@ -14,10 +14,6 @@ config NUM_IRQS config CORTEX_M_SYSTICK default !NPCX_ITIM_TIMER -config WDT_NPCX - default y - depends on WATCHDOG - config ESPI_NPCX default y depends on ESPI diff --git a/soc/arm/nxp_imx/rt/Kconfig.defconfig.series b/soc/arm/nxp_imx/rt/Kconfig.defconfig.series index cc730c450ed..cb973790bd8 100644 --- a/soc/arm/nxp_imx/rt/Kconfig.defconfig.series +++ b/soc/arm/nxp_imx/rt/Kconfig.defconfig.series @@ -70,10 +70,6 @@ config COUNTER_MCUX_GPT endif # COUNTER -config WDT_MCUX_IMX_WDOG - default y - depends on WATCHDOG - config PM_MCUX_GPC default y if HAS_MCUX_GPC depends on SOC_SERIES_IMX_RT11XX && PM diff --git a/soc/arm/nxp_imx/rt5xx/Kconfig.defconfig.mimxrt595_cm33 b/soc/arm/nxp_imx/rt5xx/Kconfig.defconfig.mimxrt595_cm33 index e1efb6fc6f4..321ce9e8787 100644 --- a/soc/arm/nxp_imx/rt5xx/Kconfig.defconfig.mimxrt595_cm33 +++ b/soc/arm/nxp_imx/rt5xx/Kconfig.defconfig.mimxrt595_cm33 @@ -20,10 +20,6 @@ config COUNTER_MCUX_CTIMER default y depends on COUNTER -config WDT_MCUX_WWDT - default y - depends on WATCHDOG - if MCUX_OS_TIMER config SYS_CLOCK_HW_CYCLES_PER_SEC diff --git a/soc/arm/nxp_imx/rt6xx/Kconfig.defconfig.mimxrt685_cm33 b/soc/arm/nxp_imx/rt6xx/Kconfig.defconfig.mimxrt685_cm33 index 26a61b0f8fc..5ce8e8e56dd 100644 --- a/soc/arm/nxp_imx/rt6xx/Kconfig.defconfig.mimxrt685_cm33 +++ b/soc/arm/nxp_imx/rt6xx/Kconfig.defconfig.mimxrt685_cm33 @@ -43,10 +43,6 @@ config COUNTER_MCUX_LPC_RTC default y depends on COUNTER -config WDT_MCUX_WWDT - default y - depends on WATCHDOG - config USB_MCUX default y depends on USB_DEVICE_DRIVER diff --git a/soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.mk22f12 b/soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.mk22f12 index 1c3161c0854..635f2444083 100644 --- a/soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.mk22f12 +++ b/soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.mk22f12 @@ -23,8 +23,4 @@ config USB_KINETIS default y depends on USB_DEVICE_DRIVER -config WDT_MCUX_WDOG - default y - depends on WATCHDOG - endif # SOC_MK22F12 diff --git a/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 b/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 index c7cd8c89ec1..c0d7ec64114 100644 --- a/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 +++ b/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 @@ -38,10 +38,6 @@ config USB_KINETIS default y depends on USB_DEVICE_DRIVER -config WDT_MCUX_WDOG - default y - depends on WATCHDOG - config COUNTER_MCUX_RTC default y depends on COUNTER diff --git a/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk66f18 b/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk66f18 index ef8dfc4b9b0..3e0832edf12 100644 --- a/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk66f18 +++ b/soc/arm/nxp_kinetis/k6x/Kconfig.defconfig.mk66f18 @@ -35,10 +35,6 @@ config USB_KINETIS default y depends on USB_DEVICE_DRIVER -config WDT_MCUX_WDOG - default y - depends on WATCHDOG - config COUNTER_MCUX_RTC default y depends on COUNTER diff --git a/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.series b/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.series index 8540a150be2..f6d8684acb4 100644 --- a/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.series +++ b/soc/arm/nxp_kinetis/k8x/Kconfig.defconfig.series @@ -34,10 +34,6 @@ config USB_KINETIS default y depends on USB_DEVICE_DRIVER -config WDT_MCUX_WDOG - default y - depends on WATCHDOG - config COUNTER_MCUX_PIT default y if HAS_MCUX_PIT depends on COUNTER diff --git a/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.series b/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.series index 7aee72e7210..288bbc4d377 100644 --- a/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.series +++ b/soc/arm/nxp_kinetis/ke1xf/Kconfig.defconfig.series @@ -29,10 +29,6 @@ config KINETIS_FLASH_CONFIG_FOPT default 0x7d depends on KINETIS_FLASH_CONFIG -config WDT_MCUX_WDOG32 - default y - depends on WATCHDOG - if COUNTER config COUNTER_MCUX_RTC diff --git a/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw2xd512 b/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw2xd512 index aad81ce794a..f112e513b5a 100644 --- a/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw2xd512 +++ b/soc/arm/nxp_kinetis/kwx/Kconfig.defconfig.mkw2xd512 @@ -31,8 +31,4 @@ config USB_KINETIS default y depends on USB_DEVICE_DRIVER -config WDT_MCUX_WDOG - default y - depends on WATCHDOG - endif # SOC_MKW2xD512 diff --git a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S28 b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S28 index 6871e99ede6..f5384f43f70 100644 --- a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S28 +++ b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S28 @@ -16,10 +16,6 @@ config SOC_FLASH_MCUX default y depends on FLASH -config WDT_MCUX_WWDT - default y - depends on WATCHDOG - config DMA_MCUX_LPC default y depends on DMA diff --git a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S69_cpu0 b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S69_cpu0 index d6b5a6030fb..1163107be90 100644 --- a/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S69_cpu0 +++ b/soc/arm/nxp_lpc/lpc55xxx/Kconfig.defconfig.lpc55S69_cpu0 @@ -17,10 +17,6 @@ config SOC_FLASH_MCUX depends on FLASH depends on !TRUSTED_EXECUTION_NONSECURE -config WDT_MCUX_WWDT - default y - depends on WATCHDOG - config DMA_MCUX_LPC default y depends on DMA diff --git a/soc/riscv/riscv-ite/it8xxx2/Kconfig.defconfig.series b/soc/riscv/riscv-ite/it8xxx2/Kconfig.defconfig.series index da5d363486c..8c600b05107 100644 --- a/soc/riscv/riscv-ite/it8xxx2/Kconfig.defconfig.series +++ b/soc/riscv/riscv-ite/it8xxx2/Kconfig.defconfig.series @@ -35,10 +35,6 @@ config UART_NS16550_WA_ISR_REENABLE_INTERRUPT config RISCV_HAS_CPU_IDLE default y -config WDT_ITE_IT8XXX2 - default y - depends on WATCHDOG - config KSCAN_ITE_IT8XXX2 default y depends on KSCAN