summaryrefslogtreecommitdiff
path: root/board/incaip
diff options
context:
space:
mode:
Diffstat (limited to 'board/incaip')
-rw-r--r--board/incaip/incaip.c6
-rw-r--r--board/incaip/lowlevel_init.S14
2 files changed, 16 insertions, 4 deletions
diff --git a/board/incaip/incaip.c b/board/incaip/incaip.c
index dbf0ecc5a..c624b3d82 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 14d738aa1..08f7f211f 100644
--- a/board/incaip/lowlevel_init.S
+++ b/board/incaip/lowlevel_init.S
@@ -105,7 +105,7 @@ __ebu_init:
li t2, 0x684143FD
sw t2, EBU_BUSCON1(t1)
3:
- j ra
+ jr ra
nop
.end ebu_init
@@ -170,7 +170,7 @@ __cgu_init:
li t2, 0x80000001
sw t2, CGU_MUXCR(t1)
5:
- j ra
+ jr ra
nop
.end cgu_init
@@ -266,7 +266,7 @@ __sdram_init:
li t2, 0x00000001
sw t2, MC_CTRLENA(t1)
- j ra
+ jr ra
nop
.end sdram_init
@@ -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
@@ -292,7 +298,7 @@ lowlevel_init:
nop
move ra, t0
- j ra
+ jr ra
nop
.end lowlevel_init