Patchwork [U-Boot,PATCH/next] 74xx_7xx/mpc86xx/ppmc7xx: Fix do_reset() declaration

login
register
mail settings
Submitter Peter Tyser
Date Dec. 3, 2010, 4:28 p.m.
Message ID <1291393727-337-1-git-send-email-ptyser@xes-inc.com>
Download mbox | patch
Permalink /patch/74164/
State Accepted
Commit c22a711d249b2b9ee39fe11bcee15ee4dbe3bf09
Headers show

Comments

Peter Tyser - Dec. 3, 2010, 4:28 p.m.
The following commit:

commit 882b7d726febe65579d6502c271412ecb05821d7
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>
---
 arch/powerpc/cpu/74xx_7xx/cpu.c |   10 +++++++---
 arch/powerpc/cpu/mpc86xx/cpu.c  |    5 +++--
 board/ppmc7xx/ppmc7xx.c         |    7 +++++--
 3 files changed, 15 insertions(+), 7 deletions(-)
Mike Frysinger - Dec. 3, 2010, 9:35 p.m.
On Friday, December 03, 2010 11:28:47 Peter Tyser wrote:
> The following commit:
> 
> commit 882b7d726febe65579d6502c271412ecb05821d7
> 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

yeah, i just noticed this last nite too.  when the patch was written, most 
boards were broken due to other common changes, so i had a hard time finding 
all the locations.  examples/api/libgenwrap.c needs updating too, but we can 
post that in a diff chageset.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-mike
Mike Frysinger - Dec. 3, 2010, 10:08 p.m.
On Friday, December 03, 2010 16:35:17 Mike Frysinger wrote:
> On Friday, December 03, 2010 11:28:47 Peter Tyser wrote:
> > The following commit:
> > 
> > commit 882b7d726febe65579d6502c271412ecb05821d7
> > 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
> 
> yeah, i just noticed this last nite too.  when the patch was written, most
> boards were broken due to other common changes, so i had a hard time
> finding all the locations.  examples/api/libgenwrap.c needs updating too,
> but we can post that in a diff chageset.

also, because this is [next], i'm not sure if wolfgang will want to squash 
these fixes into the existing change
-mike
Wolfgang Denk - Dec. 17, 2010, 7:41 p.m.
Dear Mike Frysinger,

In message <201012031708.00812.vapier@gentoo.org> you wrote:
>
> also, because this is [next], i'm not sure if wolfgang will want to squash  
> these fixes into the existing change

git doesn't want to do that.  Too many merges inbetween already.

Best regards,

Wolfgang Denk
Wolfgang Denk - Dec. 17, 2010, 7:42 p.m.
Dear Peter Tyser,

In message <1291393727-337-1-git-send-email-ptyser@xes-inc.com> you wrote:
> The following commit:
> 
> commit 882b7d726febe65579d6502c271412ecb05821d7
> 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>
> ---
>  arch/powerpc/cpu/74xx_7xx/cpu.c |   10 +++++++---
>  arch/powerpc/cpu/mpc86xx/cpu.c  |    5 +++--
>  board/ppmc7xx/ppmc7xx.c         |    7 +++++--
>  3 files changed, 15 insertions(+), 7 deletions(-)

Applied to "next", thanks.

Best regards,

Wolfgang Denk
Mike Frysinger - Dec. 17, 2010, 8:31 p.m.
On Friday, December 17, 2010 14:41:45 Wolfgang Denk wrote:
> Mike Frysinger wrote:
> > also, because this is [next], i'm not sure if wolfgang will want to
> > squash these fixes into the existing change
> 
> git doesn't want to do that.  Too many merges inbetween already.

np.  if you want to pick up Peter's patch, i'll send another one for the api 
examples file.
-mike
Wolfgang Denk - Dec. 17, 2010, 8:47 p.m.
Dear Mike Frysinger,

In message <201012171531.41016.vapier@gentoo.org> you wrote:
>
> > git doesn't want to do that.  Too many merges inbetween already.
> 
> np.  if you want to pick up Peter's patch, i'll send another one for the api 
> examples file.

Please do. TIA.

Best regards,

Wolfgang Denk

Patch

diff --git a/arch/powerpc/cpu/74xx_7xx/cpu.c b/arch/powerpc/cpu/74xx_7xx/cpu.c
index ab6f11d..b6a31b4 100644
--- a/arch/powerpc/cpu/74xx_7xx/cpu.c
+++ b/arch/powerpc/cpu/74xx_7xx/cpu.c
@@ -234,8 +234,7 @@  soft_restart(unsigned long addr)
     !defined(CONFIG_ELPPC)   && \
     !defined(CONFIG_PPMC7XX)
 /* 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;
 	/* 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);
 #endif
 	soft_restart(addr);
-	while(1);	/* not reached */
+
+	/* not reached */
+	while(1)
+		;
+
+	return 1;
 }
 #endif
 
diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c
index 4e90fd2..ffcc8e6 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu.c
@@ -123,8 +123,7 @@  checkcpu(void)
 }
 
 
-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[])
 {
 	volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
 	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)
 		;
+
+	return 1;
 }
 
 
diff --git a/board/ppmc7xx/ppmc7xx.c b/board/ppmc7xx/ppmc7xx.c
index 5e7427f..432d366 100644
--- a/board/ppmc7xx/ppmc7xx.c
+++ b/board/ppmc7xx/ppmc7xx.c
@@ -88,7 +88,7 @@  int misc_init_r( void )
  *
  * 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" );
 
@@ -100,7 +100,10 @@  void do_reset( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] )
 	_start();
 
 	/* Should never get here */
-	while(1);
+	while(1)
+		;
+
+	return 1;
 }
 
 int board_eth_init(bd_t *bis)