summaryrefslogtreecommitdiff
path: root/include/watchdog.h
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-02-23 23:54:43 +0000
committerwdenk <wdenk>2004-02-23 23:54:43 +0000
commit028ab6b598b628326116acd88e0f35aa9f526d12 (patch)
tree0d54315bd92d713a405004b6e36fca8d2b7c53e3 /include/watchdog.h
parent63e73c9a8ed5b32d9c4067ffaad953e9a8fe8f0a (diff)
downloadu-boot-imx-028ab6b598b628326116acd88e0f35aa9f526d12.zip
u-boot-imx-028ab6b598b628326116acd88e0f35aa9f526d12.tar.gz
u-boot-imx-028ab6b598b628326116acd88e0f35aa9f526d12.tar.bz2
* Patch by Peter Ryser, 20 Feb 2004:
Add support for the Xilinx ML300 platform * Patch by Stephan Linz, 17 Feb 2004: Fix watchdog support for NIOS * Patch by Josh Fryman, 16 Feb 2004: Fix byte-swapping for cfi_flash.c for different bus widths * Patch by Jon Diekema, 14 Jeb 2004: Remove duplicate "FPGA Support" notes from the README file
Diffstat (limited to 'include/watchdog.h')
-rw-r--r--include/watchdog.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/watchdog.h b/include/watchdog.h
index 7180259..ac6ba8c 100644
--- 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
*/