Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi

- watchdog: don't autostart watchdog on Sunxi boards
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index d306054..1177f17 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -12,6 +12,7 @@
 config WATCHDOG_AUTOSTART
 	bool "Automatically start watchdog timer"
 	depends on WDT
+	default n if ARCH_SUNXI
 	default y
 	help
 	  Automatically start watchdog timer and start servicing it during