From: Stefan Roese <sr@denx.de>
Date: Mon, 27 Nov 2006 13:52:04 +0000 (+0100)
Subject: [PATCH] 4xx: Fix problem with board specific reset code (now for real)
X-Git-Tag: U-Boot-1_2_0~26^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1729b92cde575476684bffe819d0b7791b57bff2;p=u-boot

[PATCH] 4xx: Fix problem with board specific reset code (now for real)

Signed-off-by: Stefan Roese <sr@denx.de>
---

diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c
index 87299c1ec0..447383f8d3 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;