summaryrefslogtreecommitdiff
path: root/cpu/mpc83xx
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2006-01-11 11:23:01 -0600
committerKumar Gala <galak@kernel.crashing.org>2006-01-11 11:23:01 -0600
commitec00c335789aea61ec13f41356805c690f059572 (patch)
treed780af876b03dcf8bfdfd6935bd238e1c2af9b77 /cpu/mpc83xx
parenta15b44dbfa2e4537b231da066b589992b0ee629d (diff)
downloadu-boot-imx-ec00c335789aea61ec13f41356805c690f059572.zip
u-boot-imx-ec00c335789aea61ec13f41356805c690f059572.tar.gz
u-boot-imx-ec00c335789aea61ec13f41356805c690f059572.tar.bz2
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
Diffstat (limited to 'cpu/mpc83xx')
-rw-r--r--cpu/mpc83xx/start.S6
1 files changed, 6 insertions, 0 deletions
diff --git a/cpu/mpc83xx/start.S b/cpu/mpc83xx/start.S
index fb001a6..0e1a5fd 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 */