watchdog: introduce separate SPL symbol for WDT_GPIO

Currently, enabling WDT_GPIO on a board which uses SPL, but does not
have SPL_WDT, SPL_DM_GPIO or SPL_OF_CONTROL enabled, breaks the build.

Make it possible to use the WDT_GPIO driver on such boards by
introducing a separate symbol controlling whether the driver is built
for SPL. Make it default to WDT_GPIO such that boards that already
have it enabled and all the SPL prerequisites satisfied will continue
to have it in SPL.

Signed-off-by: Rasmus Villemoes <ravi@prevas.dk>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index b6f7e4ee08aea6ce8ada09d7079c3e98b0a2d94b..0e45f0a0922452d2dba53aa98a6b37a75ffa2b8f 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -191,6 +191,15 @@ config WDT_GPIO
          doc/device-tree-bindings/watchdog/gpio-wdt.txt for
          information on how to describe the watchdog in device tree.
 
+config SPL_WDT_GPIO
+       bool "External gpio watchdog support in SPL"
+       depends on SPL_WDT
+       depends on SPL_DM_GPIO
+       depends on SPL_OF_REAL
+       default WDT_GPIO
+       help
+         Support for external watchdog fed by toggling a gpio in SPL.
+
 config WDT_MAX6370
        bool "MAX6370 watchdog timer support"
        depends on WDT

diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index cef98975d0784e5b41e7840bd46738a7af9a09a9..0b107c008f7ff2a9b13a3ee997cb65b8addcfaee 100644 (file)
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -32,7 +32,7 @@ obj-$(CONFIG_WDT_CDNS) += cdns_wdt.o
 obj-$(CONFIG_WDT_DA9063) += da9063-wdt.o
 obj-$(CONFIG_WDT_DAVINCI) += davinci_wdt.o
 obj-$(CONFIG_WDT_FTWDT010) += ftwdt010_wdt.o
-obj-$(CONFIG_WDT_GPIO) += gpio_wdt.o
+obj-$(CONFIG_$(SPL_TPL_)WDT_GPIO) += gpio_wdt.o
 obj-$(CONFIG_WDT_MAX6370) += max6370_wdt.o
 obj-$(CONFIG_WDT_MCF) += mcf_wdt.o
 obj-$(CONFIG_WDT_MESON_GXBB) += meson_gxbb_wdt.o