[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 14d738aa1a772b596419028db3cb3b23d714bad0..b39f93d43f2593cf8fef56bdec221fb4e5721f22 100644 (file)
--- 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 930f9b3fde1a902eb2bb631dae12a0ad854726ea..fde2944a0dd46eeffe2f9c0c86eb9462991ab325 100644 (file)
--- 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