summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2007-01-30 16:15:31 -0600
committerKim Phillips <kim.phillips@freescale.com>2007-03-02 11:05:53 -0600
commit97c4b397dce236a7318b304667bf89e59d08b17c (patch)
tree982670d5a0e4f5f252689f69167f05840e05036a
parentb70047478570e371ce7223be342ce98afea0f7d6 (diff)
downloadu-boot-imx-97c4b397dce236a7318b304667bf89e59d08b17c.zip
u-boot-imx-97c4b397dce236a7318b304667bf89e59d08b17c.tar.gz
u-boot-imx-97c4b397dce236a7318b304667bf89e59d08b17c.tar.bz2
mpc83xx: don't hang if watchdog configured on 8360, 832x
don't hang if watchdog configured on 8360, 832x The watchdog programming model is the same across all 83xx devices; make the code reflect that.
-rw-r--r--cpu/mpc83xx/cpu.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c
index f83981e..c24a20f 100644
--- a/cpu/mpc83xx/cpu.c
+++ b/cpu/mpc83xx/cpu.c
@@ -266,7 +266,6 @@ unsigned long get_tbclk(void)
#if defined(CONFIG_WATCHDOG)
void watchdog_reset (void)
{
-#ifdef CONFIG_MPC834X
int re_enable = disable_interrupts();
/* Reset the 83xx watchdog */
@@ -276,9 +275,6 @@ void watchdog_reset (void)
if (re_enable)
enable_interrupts ();
-#else
- hang();
-#endif
}
#endif