[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 87299c1ec0d74cd9060bb229518ea79d19e894d9..447383f8d3c1f9672d06b7532e24b2573c097488 100644 (file)
--- 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;