summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Kuribayashi <skuribay@ruby.dti.ne.jp>2008-03-25 21:30:07 +0900
committerShinya Kuribayashi <skuribay@ruby.dti.ne.jp>2008-03-25 21:30:07 +0900
commit26138623230ca2bad3c78e05a65527ea70c8b688 (patch)
treed2ca428bb6c9e90790bee8fbc97e6e88d11ad344
parentccf8f824ef67df028dedb29f8ea5d71a5a88d895 (diff)
downloadu-boot-imx-26138623230ca2bad3c78e05a65527ea70c8b688.zip
u-boot-imx-26138623230ca2bad3c78e05a65527ea70c8b688.tar.gz
u-boot-imx-26138623230ca2bad3c78e05a65527ea70c8b688.tar.bz2
[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>
-rw-r--r--board/incaip/lowlevel_init.S6
-rw-r--r--cpu/mips/start.S8
2 files changed, 6 insertions, 8 deletions
diff --git a/board/incaip/lowlevel_init.S b/board/incaip/lowlevel_init.S
index 14d738a..b39f93d 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 930f9b3..fde2944 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