mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-20 22:21:41 +00:00
74xx_7xx/mpc86xx/ppmc7xx: Fix do_reset() declaration
The following commit:
commit 882b7d726f
Author: Mike Frysinger <vapier@gentoo.org>
Date: Wed Oct 20 03:41:17 2010 -0400
do_reset: unify duplicate prototypes
missed the 74xx_7xx and mpc86xx arches and the ppmc7xx board do_reset()
functions which resulted in build errors such as:
cpu.c:128: error: conflicting types for 'do_reset'
include/command.h:102: error: previous declaration of 'do_reset' was here
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
This commit is contained in:
parent
ee0270dff7
commit
c22a711d24
3 changed files with 15 additions and 7 deletions
|
@ -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
|
int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||||
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
|
||||||
|
|
||||||
|
|
|
@ -123,8 +123,7 @@ checkcpu(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||||
do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
||||||
{
|
{
|
||||||
volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
|
volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
|
||||||
volatile ccsr_gur_t *gur = &immap->im_gur;
|
volatile ccsr_gur_t *gur = &immap->im_gur;
|
||||||
|
@ -137,6 +136,8 @@ do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||||
|
|
||||||
while (1)
|
while (1)
|
||||||
;
|
;
|
||||||
|
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -88,7 +88,7 @@ int misc_init_r( void )
|
||||||
*
|
*
|
||||||
* Shell command to reset the board.
|
* Shell command to reset the board.
|
||||||
*/
|
*/
|
||||||
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[])
|
||||||
{
|
{
|
||||||
printf( "Resetting...\n" );
|
printf( "Resetting...\n" );
|
||||||
|
|
||||||
|
@ -100,7 +100,10 @@ void do_reset( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] )
|
||||||
_start();
|
_start();
|
||||||
|
|
||||||
/* Should never get here */
|
/* Should never get here */
|
||||||
while(1);
|
while(1)
|
||||||
|
;
|
||||||
|
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int board_eth_init(bd_t *bis)
|
int board_eth_init(bd_t *bis)
|
||||||
|
|
Loading…
Add table
Reference in a new issue