Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / include / watchdog.h

diff --git a/include/watchdog.h b/include/watchdog.h
index 7180259d05445db5e08a77493194b7c4778226d0..ef2f5aac9bef0820ca037e4dbd83511672c3af49 100644 (file)
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -31,6 +31,10 @@
 #  error "Configuration error: CONFIG_HW_WATCHDOG and CONFIG_WATCHDOG can't be used together."
 #endif
 
+#if defined(__ASSEMBLY__) && defined(__NIOS__)
+#  error "Configuration error: WATCHDOG_RESET inside assembler not supported for Nios platforms."
+#endif
+
 /*
  * Hardware watchdog
  */
@@ -80,7 +84,12 @@
        void reset_5xx_watchdog(volatile immap_t *immr);
 #endif
 
-/* IBM 4xx */
+/* 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