diff options
| author | wdenk | 2004-02-23 23:54:43 +0000 |
|---|---|---|
| committer | wdenk | 2004-02-23 23:54:43 +0000 |
| commit | 028ab6b598b628326116acd88e0f35aa9f526d12 (patch) | |
| tree | 0d54315bd92d713a405004b6e36fca8d2b7c53e3 /lib_nios | |
| parent | 63e73c9a8ed5b32d9c4067ffaad953e9a8fe8f0a (diff) | |
* 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 'lib_nios')
| -rw-r--r-- | lib_nios/board.c | 5 | ||||
| -rw-r--r-- | lib_nios/time.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lib_nios/board.c b/lib_nios/board.c index fb477e94e0c..d6c02d8a4ce 100644 --- a/lib_nios/board.c +++ b/lib_nios/board.c @@ -139,13 +139,16 @@ void board_init (void) bd->bi_baudrate = CONFIG_BAUDRATE; for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) { + WATCHDOG_RESET (); if ((*init_fnc_ptr) () != 0) { hang (); } } + WATCHDOG_RESET (); bd->bi_flashsize = flash_init(); + WATCHDOG_RESET (); mem_malloc_init(); malloc_bin_reloc(); env_relocate(); @@ -157,12 +160,14 @@ void board_init (void) if (s) s = (*e) ? e + 1 : e; } + WATCHDOG_RESET (); devices_init(); jumptable_init(); console_init_r(); /* */ + WATCHDOG_RESET (); interrupt_init (); #ifdef CONFIG_STATUS_LED diff --git a/lib_nios/time.c b/lib_nios/time.c index 765b9c1989a..25a233ea785 100644 --- a/lib_nios/time.c +++ b/lib_nios/time.c @@ -22,6 +22,7 @@ */ #include <common.h> +#include <watchdog.h> extern void dly_clks( unsigned long ticks ); @@ -33,5 +34,6 @@ void udelay(unsigned long usec) * cpu clocks. */ unsigned long cnt = (CONFIG_SYS_CLK_FREQ/1000000) * usec; + WATCHDOG_RESET (); /* trigger watchdog if needed */ dly_clks (cnt); } |