diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-03-26 00:44:52 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-03-26 00:44:52 +0100 |
| commit | 6525489323e5ab88cda947b4bc5a228ee624a75c (patch) | |
| tree | e45dfb8d991928b9dad0e663f6d8a399bbe59d4e /board | |
| parent | 08e94432300e48624de6f9533412836cf852abae (diff) | |
| parent | 8a773983957ee6c4aa344469b742f29c7d26afbd (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mips
Diffstat (limited to 'board')
| -rw-r--r-- | board/incaip/incaip.c | 6 | ||||
| -rw-r--r-- | board/incaip/lowlevel_init.S | 6 | ||||
| -rw-r--r-- | board/purple/purple.c | 8 | ||||
| -rw-r--r-- | board/tb0229/tb0229.c | 9 |
4 files changed, 28 insertions, 1 deletions
diff --git a/board/incaip/incaip.c b/board/incaip/incaip.c index dbf0ecc5af3..c624b3d82e2 100644 --- a/board/incaip/incaip.c +++ b/board/incaip/incaip.c @@ -26,9 +26,15 @@ #include <asm/addrspace.h> #include <asm/inca-ip.h> #include <asm/io.h> +#include <asm/reboot.h> extern uint incaip_get_cpuclk(void); +void _machine_restart(void) +{ + *INCA_IP_WDT_RST_REQ = 0x3f; +} + static ulong max_sdram_size(void) { /* The only supported SDRAM data width is 16bit. diff --git a/board/incaip/lowlevel_init.S b/board/incaip/lowlevel_init.S index 14d738aa1a7..b39f93d43f2 100644 --- a/board/incaip/lowlevel_init.S +++ b/board/incaip/lowlevel_init.S @@ -276,6 +276,12 @@ __sdram_init: .ent lowlevel_init lowlevel_init: + /* Disable Watchdog. + */ + la t9, disable_incaip_wdt + jalr t9 + nop + /* EBU, CGU and SDRAM Initialization. */ li a0, CPU_CLOCK_RATE diff --git a/board/purple/purple.c b/board/purple/purple.c index 74718afb489..13a14556ba0 100644 --- a/board/purple/purple.c +++ b/board/purple/purple.c @@ -29,6 +29,7 @@ #include <asm/io.h> #include <asm/addrspace.h> #include <asm/cacheops.h> +#include <asm/reboot.h> #include "sconsole.h" @@ -52,6 +53,13 @@ extern int asc_serial_getc (void); extern int asc_serial_tstc (void); extern void asc_serial_setbrg (void); +void _machine_restart(void) +{ + void (*f)(void) = (void *) 0xbfc00000; + + f(); +} + static void sdram_timing_init (ulong size) { register uint pass; diff --git a/board/tb0229/tb0229.c b/board/tb0229/tb0229.c index 61c2e9bd366..d08b4224516 100644 --- a/board/tb0229/tb0229.c +++ b/board/tb0229/tb0229.c @@ -12,10 +12,17 @@ #include <common.h> #include <command.h> #include <asm/addrspace.h> -#include <asm/inca-ip.h> #include <asm/io.h> +#include <asm/reboot.h> #include <pci.h> +void _machine_restart(void) +{ + void (*f)(void) = (void *) 0xbfc00000; + + f(); +} + #if defined(CONFIG_PCI) static struct pci_controller hose; |