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

Signed-off-by: Stefan Roese <sr@denx.de>
19 years ago · 1729b92cde
parent cc5ee8a92a
commit 1729b92cde
1 changed files with 2 additions and 1 deletions
--- 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;