projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b700474
)
mpc83xx: don't hang if watchdog configured on 8360, 832x
author
Kim Phillips
<kim.phillips@freescale.com>
Tue, 30 Jan 2007 22:15:31 +0000
(16:15 -0600)
committer
Kim Phillips
<kim.phillips@freescale.com>
Fri, 2 Mar 2007 17:05:53 +0000
(11:05 -0600)
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.
cpu/mpc83xx/cpu.c
patch
|
blob
|
history
diff --git
a/cpu/mpc83xx/cpu.c
b/cpu/mpc83xx/cpu.c
index f83981e8b8748c4d66f9c3d82218152b14e77ced..c24a20f2be1bef220e6dc2b8166b77d0cf7fa282 100644
(file)
--- 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