From: Kumar Gala <galak@kernel.crashing.org>
Date: Wed, 11 Jan 2006 17:23:01 +0000 (-0600)
Subject: Only disable the MPC83xx watchdog if its enabled out of reset.
X-Git-Tag: LABEL_2006_05_19_1133~16^2^2~13
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ec00c335789aea61ec13f41356805c690f059572;p=oweals%2Fu-boot.git

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 ec68f1b2a0..6dc76d26d5 100644
--- 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 fb001a654c..0e1a5fd572 100644
--- 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 */