Message ID | 20111104163427.db13a668c89386e254098062@freescale.com |
---|---|
State | Rejected |
Headers | show |
Dear Kim Phillips, In message <20111104163427.db13a668c89386e254098062@freescale.com> you wrote: > This reverts commit a9f4fc3fe571cc99260b063ad0ff291d31bafed0. > > commit aab773a47a8f7f40b9d7c4877853b00d22fb1347 already fixed the > issue. > > Signed-off-by: Kim Phillips <kim.phillips@freescale.com> > --- > arch/powerpc/lib/board.c | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c > index 3a1b375..508075f 100644 > --- a/arch/powerpc/lib/board.c > +++ b/arch/powerpc/lib/board.c > @@ -625,9 +625,7 @@ void board_init_r (gd_t *id, ulong dest_addr) > { > bd_t *bd; > ulong malloc_start; > -#if defined(CONFIG_SYS_FLASH_CHECKSUM) || defined(CONFIG_CMD_NET) > - char *s; > -#endif > + Which tree / version is your patch based on? It does not apply to master. We fixed this with commit commit ecfd752. Best regards, Wolfgang Denk
On Saturday 05 November 2011 05:33:38 Wolfgang Denk wrote: > Kim Phillips wrote: > > This reverts commit a9f4fc3fe571cc99260b063ad0ff291d31bafed0. > > > > commit aab773a47a8f7f40b9d7c4877853b00d22fb1347 already fixed the > > issue. > > > > --- a/arch/powerpc/lib/board.c > > +++ b/arch/powerpc/lib/board.c > > @@ -625,9 +625,7 @@ void board_init_r (gd_t *id, ulong dest_addr) > > > > { > > > > bd_t *bd; > > ulong malloc_start; > > > > -#if defined(CONFIG_SYS_FLASH_CHECKSUM) || defined(CONFIG_CMD_NET) > > - char *s; > > -#endif > > + > > Which tree / version is your patch based on? It does not apply to > master. We fixed this with commit commit ecfd752. have you pushed out your master in a while ? i see your tree sitting at fec79acc864bed049b6beae719ccbf2bbec5403a which still has this warning. i also don't see commit ecfd752 in your tree. -mike
Dear Mike Frysinger, In message <201111061306.37421.vapier@gentoo.org> you wrote: > > have you pushed out your master in a while ? i see your tree sitting at > fec79acc864bed049b6beae719ccbf2bbec5403a which still has this warning. i also > don't see commit ecfd752 in your tree. master is in sync. But you are right - ecfd752 is in my GCC 4.6 cleanup branch. I will wait another day for feedback on these and then pull them. Best regards, Wolfgang Denk
diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index 3a1b375..508075f 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -625,9 +625,7 @@ void board_init_r (gd_t *id, ulong dest_addr) { bd_t *bd; ulong malloc_start; -#if defined(CONFIG_SYS_FLASH_CHECKSUM) || defined(CONFIG_CMD_NET) - char *s; -#endif + #ifndef CONFIG_SYS_NO_FLASH ulong flash_size; #endif
This reverts commit a9f4fc3fe571cc99260b063ad0ff291d31bafed0. commit aab773a47a8f7f40b9d7c4877853b00d22fb1347 already fixed the issue. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> --- arch/powerpc/lib/board.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)