X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fwatchdog.h;h=97ec186be32e43fa2d40173b57718f1f1bb34eee;hb=70656c79f3c85df77b65cda0237f5454851186ca;hp=328a30b9aae8e22307f03dc93dd8c57bfa3da98a;hpb=abbab70363dcdb270cbf24d47849214dd3a3e010;p=u-boot

diff --git a/include/watchdog.h b/include/watchdog.h
index 328a30b9aa..97ec186be3 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -27,6 +27,24 @@
 #ifndef _WATCHDOG_H_
 #define _WATCHDOG_H_
 
+#if !defined(__ASSEMBLY__)
+/*
+ * Reset the watchdog timer, always returns 0
+ *
+ * This function is here since it is shared between board_f() and board_r(),
+ * and the legacy arch/<arch>/board.c code.
+ */
+int init_func_watchdog_reset(void);
+#endif
+
+#ifdef CONFIG_WATCHDOG
+#define INIT_FUNC_WATCHDOG_INIT	init_func_watchdog_init,
+#define INIT_FUNC_WATCHDOG_RESET	init_func_watchdog_reset,
+#else
+#define INIT_FUNC_WATCHDOG_INIT
+#define INIT_FUNC_WATCHDOG_RESET
+#endif
+
 #if defined(CONFIG_HW_WATCHDOG) && defined(CONFIG_WATCHDOG)
 #  error "Configuration error: CONFIG_HW_WATCHDOG and CONFIG_WATCHDOG can't be used together."
 #endif
@@ -35,7 +53,6 @@
  * Hardware watchdog
  */
 #ifdef CONFIG_HW_WATCHDOG
-	void hw_watchdog_init(void);
 	#if defined(__ASSEMBLY__)
 		#define WATCHDOG_RESET bl hw_watchdog_reset
 	#else
@@ -91,4 +108,8 @@
 	void reset_4xx_watchdog(void);
 #endif
 
+/* Freescale i.MX */
+#if defined(CONFIG_IMX_WATCHDOG) && !defined(__ASSEMBLY__)
+	void hw_watchdog_init(void);
+#endif
 #endif /* _WATCHDOG_H_ */