Only disable the MPC83xx watchdog if its enabled out of reset

Signed-off-by: Kumar Gala galak@kernel.crashing.org

CHANGELOG: * 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 21 Dec 2005

--- commit 660737c7f106a7c7817375ed29e52fbf28c5838f tree d2448e66f669ed2a5464535eab5a747aafe14eb1 parent ae907acc35249e178692e74a6f76df6eb217cf6b author Kumar Gala galak@kernel.crashing.org Wed, 21 Dec 2005 17:39:01 -0600 committer Kumar Gala galak@kernel.crashing.org Wed, 21 Dec 2005 17:39:01 -0600

cpu/mpc83xx/start.S | 6 ++++++ 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 */