|
@@ -234,8 +234,7 @@ soft_restart(unsigned long addr)
|
|
!defined(CONFIG_ELPPC) && \
|
|
!defined(CONFIG_ELPPC) && \
|
|
!defined(CONFIG_PPMC7XX)
|
|
!defined(CONFIG_PPMC7XX)
|
|
/* no generic way to do board reset. simply call soft_reset. */
|
|
/* no generic way to do board reset. simply call soft_reset. */
|
|
-void
|
|
|
|
-do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
|
|
|
|
+int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
{
|
|
ulong addr;
|
|
ulong addr;
|
|
/* flush and disable I/D cache */
|
|
/* flush and disable I/D cache */
|
|
@@ -263,7 +262,12 @@ do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
addr = CONFIG_SYS_MONITOR_BASE - sizeof (ulong);
|
|
addr = CONFIG_SYS_MONITOR_BASE - sizeof (ulong);
|
|
#endif
|
|
#endif
|
|
soft_restart(addr);
|
|
soft_restart(addr);
|
|
- while(1); /* not reached */
|
|
|
|
|
|
+
|
|
|
|
+ /* not reached */
|
|
|
|
+ while(1)
|
|
|
|
+ ;
|
|
|
|
+
|
|
|
|
+ return 1;
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
|