| Message ID | 1319434952-10971-1-git-send-email-hs@denx.de |
|---|---|
| State | Rejected |
| Headers | show |
On Monday, October 24, 2011 07:42:32 AM Heiko Schocher wrote: > since commit dc8bbea0170eb2aca428ea221c91fc2e5e11f199 building > arch/arm/lib/board.c breaks if CONFIG_CMD_NET is defined. > Fix this. > > Signed-off-by: Heiko Schocher <hs@denx.de> > Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> > Cc: Simon Glass <sjg@chromium.org> > --- > arch/arm/lib/board.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c > index ad02dbd..c1a3f2c 100644 > --- a/arch/arm/lib/board.c > +++ b/arch/arm/lib/board.c > @@ -440,6 +440,9 @@ void board_init_r(gd_t *id, ulong dest_addr) > #if !defined(CONFIG_SYS_NO_FLASH) > ulong flash_size; > #endif > +#if defined(CONFIG_CMD_NET) > + char *s; > +#endif > > gd = id; I just sent something similar, but please use this one. Cheers
Hi Heiko, Le 24/10/2011 07:42, Heiko Schocher a écrit : > since commit dc8bbea0170eb2aca428ea221c91fc2e5e11f199 building > arch/arm/lib/board.c breaks if CONFIG_CMD_NET is defined. > Fix this. > > Signed-off-by: Heiko Schocher<hs@denx.de> > Cc: Albert ARIBAUD<albert.u.boot@aribaud.net> > Cc: Simon Glass<sjg@chromium.org> > --- > arch/arm/lib/board.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c > index ad02dbd..c1a3f2c 100644 > --- a/arch/arm/lib/board.c > +++ b/arch/arm/lib/board.c > @@ -440,6 +440,9 @@ void board_init_r(gd_t *id, ulong dest_addr) > #if !defined(CONFIG_SYS_NO_FLASH) > ulong flash_size; > #endif > +#if defined(CONFIG_CMD_NET) > + char *s; > +#endif > > gd = id; > Applied to u-boot-arm/master, thanks. Amicalement,
Dear Albert ARIBAUD, In message <4EA59236.4000607@aribaud.net> you wrote: > > Le 24/10/2011 07:42, Heiko Schocher a écrit : > > since commit dc8bbea0170eb2aca428ea221c91fc2e5e11f199 building > > arch/arm/lib/board.c breaks if CONFIG_CMD_NET is defined. > > Fix this. > > > > Signed-off-by: Heiko Schocher<hs@denx.de> > > Cc: Albert ARIBAUD<albert.u.boot@aribaud.net> > > Cc: Simon Glass<sjg@chromium.org> > > --- > > arch/arm/lib/board.c | 3 +++ > > 1 files changed, 3 insertions(+), 0 deletions(-) > > > > diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c > > index ad02dbd..c1a3f2c 100644 > > --- a/arch/arm/lib/board.c > > +++ b/arch/arm/lib/board.c > > @@ -440,6 +440,9 @@ void board_init_r(gd_t *id, ulong dest_addr) > > #if !defined(CONFIG_SYS_NO_FLASH) > > ulong flash_size; > > #endif > > +#if defined(CONFIG_CMD_NET) > > + char *s; > > +#endif > > > > gd = id; > > > > Applied to u-boot-arm/master, thanks. Sorry for disagreeing - but I like Simon's patch better than both Heiko's and my own, because it does without additional #ifdef. And sorry again, I pull this directly to get the build issues fixed quickly. Best regards, Wolfgang Denk
Dear Marek Vasut, In message <201110241115.45602.marek.vasut@gmail.com> you wrote: > > I just sent something similar, but please use this one. It's really interesting to see how many people wake up if they are affected - and then hack away and send patches without even checing how many similar patches have been sent before :-( Best regards, Wolfgang Denk
Hi Wolfgang, Le 24/10/2011 21:12, Wolfgang Denk a écrit : > Dear Albert ARIBAUD, > > In message<4EA59236.4000607@aribaud.net> you wrote: >> >> Le 24/10/2011 07:42, Heiko Schocher a écrit : >>> since commit dc8bbea0170eb2aca428ea221c91fc2e5e11f199 building >>> arch/arm/lib/board.c breaks if CONFIG_CMD_NET is defined. >>> Fix this. >>> >>> Signed-off-by: Heiko Schocher<hs@denx.de> >>> Cc: Albert ARIBAUD<albert.u.boot@aribaud.net> >>> Cc: Simon Glass<sjg@chromium.org> >>> --- >>> arch/arm/lib/board.c | 3 +++ >>> 1 files changed, 3 insertions(+), 0 deletions(-) >>> >>> diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c >>> index ad02dbd..c1a3f2c 100644 >>> --- a/arch/arm/lib/board.c >>> +++ b/arch/arm/lib/board.c >>> @@ -440,6 +440,9 @@ void board_init_r(gd_t *id, ulong dest_addr) >>> #if !defined(CONFIG_SYS_NO_FLASH) >>> ulong flash_size; >>> #endif >>> +#if defined(CONFIG_CMD_NET) >>> + char *s; >>> +#endif >>> >>> gd = id; >>> >> >> Applied to u-boot-arm/master, thanks. > > Sorry for disagreeing - but I like Simon's patch better than both > Heiko's and my own, because it does without additional #ifdef. > > And sorry again, I pull this directly to get the build issues fixed > quickly. That's fine with me. :) I've removed Heiko's patch from u-boot-arm/master. (ARM tree custodians -- Cc:ed -- please rebase onto new u-boot-arm/master) > Best regards, > > Wolfgang Denk Amicalement,
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index ad02dbd..c1a3f2c 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -440,6 +440,9 @@ void board_init_r(gd_t *id, ulong dest_addr) #if !defined(CONFIG_SYS_NO_FLASH) ulong flash_size; #endif +#if defined(CONFIG_CMD_NET) + char *s; +#endif gd = id;
since commit dc8bbea0170eb2aca428ea221c91fc2e5e11f199 building arch/arm/lib/board.c breaks if CONFIG_CMD_NET is defined. Fix this. Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Simon Glass <sjg@chromium.org> --- arch/arm/lib/board.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)