projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cc5ee8a
)
[PATCH] 4xx: Fix problem with board specific reset code (now for real)
author
Stefan Roese
<sr@denx.de>
Mon, 27 Nov 2006 13:52:04 +0000
(14:52 +0100)
committer
Stefan Roese
<sr@denx.de>
Mon, 27 Nov 2006 13:52:04 +0000
(14:52 +0100)
Signed-off-by: Stefan Roese <sr@denx.de>
cpu/ppc4xx/cpu.c
patch
|
blob
|
history
diff --git
a/cpu/ppc4xx/cpu.c
b/cpu/ppc4xx/cpu.c
index
87299c1
..
447383f
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;