summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2006-11-27 14:52:04 +0100
committerStefan Roese <sr@denx.de>2006-11-27 14:52:04 +0100
commit1729b92cde575476684bffe819d0b7791b57bff2 (patch)
tree5f764ed2ebd3f7f14bba50e6f0f8cd0450018aa0 /cpu
parentcc5ee8a92a0e3ca6f727af71b8fd206460c7afd7 (diff)
[PATCH] 4xx: Fix problem with board specific reset code (now for real)
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/ppc4xx/cpu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c
index 87299c1ec0d..447383f8d3c 100644
--- a/cpu/ppc4xx/cpu.c
+++ b/cpu/ppc4xx/cpu.c
@@ -428,7 +428,7 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
#if defined(CONFIG_BOARD_RESET)
board_reset();
-#else /* defined(CONFIG_BOARD_RESET) */
+#else
#if defined(CFG_4xx_RESET_TYPE)
mtspr(dbcr0, CFG_4xx_RESET_TYPE << 28);
#else
@@ -436,6 +436,7 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
* Initiate system reset in debug control register DBCR
*/
mtspr(dbcr0, 0x30000000);
+#endif /* defined(CFG_4xx_RESET_TYPE) */
#endif /* defined(CONFIG_BOARD_RESET) */
return 1;