X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fwatchdog.h;h=97ec186be32e43fa2d40173b57718f1f1bb34eee;hb=70656c79f3c85df77b65cda0237f5454851186ca;hp=9265be9737245d7a1e8468c398aef12d07945bad;hpb=0c8721a466b5e0eca7e7fbe1007777fa82100541;p=u-boot

diff --git a/include/watchdog.h b/include/watchdog.h
index 9265be9737..97ec186be3 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -27,12 +27,26 @@
 #ifndef _WATCHDOG_H_
 #define _WATCHDOG_H_
 
-#if defined(CONFIG_HW_WATCHDOG) && defined(CONFIG_WATCHDOG)
-#  error "Configuration error: CONFIG_HW_WATCHDOG and CONFIG_WATCHDOG can't be used together."
+#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
 
-#if defined(__ASSEMBLY__) && defined(__NIOS__)
-#  error "Configuration error: WATCHDOG_RESET inside assembler not supported for Nios platforms."
+#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
 
 /*
@@ -84,9 +98,18 @@
 	void reset_5xx_watchdog(volatile immap_t *immr);
 #endif
 
+/* MPC 5xxx */
+#if defined(CONFIG_MPC5xxx) && !defined(__ASSEMBLY__)
+	void reset_5xxx_watchdog(void);
+#endif
+
 /* AMCC 4xx */
 #if defined(CONFIG_4xx) && !defined(__ASSEMBLY__)
 	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_ */