From: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Date: Tue, 25 Mar 2008 12:30:07 +0000 (+0900)
Subject: [MIPS] INCA-IP: Move watchdog init code from start.S to lowlevel_init()
X-Git-Tag: v1.3.3-rc1~171^2~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=26138623230ca2bad3c78e05a65527ea70c8b688;p=u-boot

[MIPS] INCA-IP: Move watchdog init code from start.S to lowlevel_init()

Move things to appropriate place.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
---

diff --git a/board/incaip/lowlevel_init.S b/board/incaip/lowlevel_init.S
index 14d738aa1a..b39f93d43f 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/cpu/mips/start.S b/cpu/mips/start.S
index 930f9b3fde..fde2944a0d 100644
--- a/cpu/mips/start.S
+++ b/cpu/mips/start.S
@@ -240,14 +240,6 @@ reset:
 1:
 	lw	gp, 0(ra)
 
-#ifdef CONFIG_INCA_IP
-	/* Disable INCA-IP Watchdog.
-	 */
-	la	t9, disable_incaip_wdt
-	jalr	t9
-	nop
-#endif
-
 	/* Initialize any external memory.
 	 */
 	la	t9, lowlevel_init