* 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
diff --git a/lib_nios/board.c b/lib_nios/board.c
index fb477e9..d6c02d8 100644
--- a/lib_nios/board.c
+++ b/lib_nios/board.c
@@ -139,13 +139,16 @@
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 @@
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 765b9c1..25a233e 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 @@
* cpu clocks.
*/
unsigned long cnt = (CONFIG_SYS_CLK_FREQ/1000000) * usec;
+ WATCHDOG_RESET (); /* trigger watchdog if needed */
dly_clks (cnt);
}