X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fwatchdog.h;h=a4a4e8e614e4af30f75b651d62e7dd3f9d4bff2d;hb=9cb895203a46654f7ee6dd95be5c8ab05e4dfbd3;hp=322dda79f070ef748c8e22891e2276053f6ea51d;hpb=235c5b8315c6a9eb566fd3d99a098cc6db869fc5;p=oweals%2Fu-boot.git

diff --git a/include/watchdog.h b/include/watchdog.h
index 322dda79f0..a4a4e8e614 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2001
  * Erik Theisen,  Wave 7 Optics, etheisen@mindspring.com.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
@@ -52,9 +51,15 @@ int init_func_watchdog_reset(void);
 		#if defined(__ASSEMBLY__)
 			#define WATCHDOG_RESET bl watchdog_reset
 		#else
-			extern void watchdog_reset(void);
+			/* Don't require the watchdog to be enabled in SPL */
+			#if defined(CONFIG_SPL_BUILD) &&		\
+				!defined(CONFIG_SPL_WATCHDOG_SUPPORT)
+				#define WATCHDOG_RESET() {}
+			#else
+				extern void watchdog_reset(void);
 
-			#define WATCHDOG_RESET watchdog_reset
+				#define WATCHDOG_RESET watchdog_reset
+			#endif
 		#endif
 	#else
 		/*
@@ -72,12 +77,7 @@ int init_func_watchdog_reset(void);
  * Prototypes from $(CPU)/cpu.c.
  */
 
-/* AMCC 4xx */
-#if defined(CONFIG_4xx) && !defined(__ASSEMBLY__)
-	void reset_4xx_watchdog(void);
-#endif
-
-#if defined(CONFIG_HW_WATCHDOG) && !defined(__ASSEMBLY__)
+#if (defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)) && !defined(__ASSEMBLY__)
 	void hw_watchdog_init(void);
 #endif