Only disable the MPC83xx watchdog if its enabled out of reset.

If its disabled out of reset SW can later enable it if so desired
Patch by Kumar Gala, 11 Jan 2006

diff --git a/CHANGELOG b/CHANGELOG
index ec68f1b2a032daae339f38a1a454dec90b54b56d..6dc76d26d58130dec80c13516882085728a68ae1 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Only disable the MPC83xx watchdog if its enabled out of reset.
+  If its disabled out of reset SW can later enable it if so desired
+  Patch by Kumar Gala, 11 Jan 2006
+
 * Allow config of GPIO direction & data registers at boot on 83xx
   Patch by Kumar Gala, 11 Jan 2006
 

diff --git a/cpu/mpc83xx/start.S b/cpu/mpc83xx/start.S
index fb001a654c5afa6cdd8958b365e3a547d624c91d..0e1a5fd5726d250e58860ae420d9ddb5f39a3ae0 100644 (file)
--- a/cpu/mpc83xx/start.S
+++ b/cpu/mpc83xx/start.S
@@ -426,8 +426,14 @@ init_e300_core: /* time t 10 */
 #else
        /* Disable Wathcdog  */
        /*-------------------*/
+       lwz r4, SWCRR(r3)
+       /* Check to see if its enabled for disabling
+          once disabled by SW you can't re-enable */
+       andi. r4, r4, 0x4
+       beq 1f
        xor r4, r4, r4
        stw r4, SWCRR(r3)
+1:
 #endif /* CONFIG_WATCHDOG */
 
        /* Initialize the Hardware Implementation-dependent Registers */