[U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage

[U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage

[Heiko Schocher]

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;
 
-- 
1.7.6.4

[U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage

[Marek Vasut]

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

[U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage

[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

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Every program has at least one bug and can be shortened by  at  least
one  instruction  --  from  which,  by induction, one can deduce that
every program can be reduced to one instruction which doesn't work.

[U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage

[Albert ARIBAUD]

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,
-- 
Albert.

[U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage

[Wolfgang Denk]

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

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
core error - bus dumped

[U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage

[Albert ARIBAUD]

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,
-- 
Albert.