* [U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage
@ 2011-10-24 5:42 Heiko Schocher
2011-10-24 9:15 ` Marek Vasut
2011-10-24 16:28 ` Albert ARIBAUD
0 siblings, 2 replies; 6+ messages in thread
From: Heiko Schocher @ 2011-10-24 5:42 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage
2011-10-24 5:42 [U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage Heiko Schocher
@ 2011-10-24 9:15 ` Marek Vasut
2011-10-24 19:24 ` Wolfgang Denk
2011-10-24 16:28 ` Albert ARIBAUD
1 sibling, 1 reply; 6+ messages in thread
From: Marek Vasut @ 2011-10-24 9:15 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage
2011-10-24 5:42 [U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage Heiko Schocher
2011-10-24 9:15 ` Marek Vasut
@ 2011-10-24 16:28 ` Albert ARIBAUD
2011-10-24 19:12 ` Wolfgang Denk
1 sibling, 1 reply; 6+ messages in thread
From: Albert ARIBAUD @ 2011-10-24 16:28 UTC (permalink / raw)
To: u-boot
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage
2011-10-24 16:28 ` Albert ARIBAUD
@ 2011-10-24 19:12 ` Wolfgang Denk
2011-10-24 19:26 ` Albert ARIBAUD
0 siblings, 1 reply; 6+ messages in thread
From: Wolfgang Denk @ 2011-10-24 19:12 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage
2011-10-24 9:15 ` Marek Vasut
@ 2011-10-24 19:24 ` Wolfgang Denk
0 siblings, 0 replies; 6+ messages in thread
From: Wolfgang Denk @ 2011-10-24 19:24 UTC (permalink / raw)
To: u-boot
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage
2011-10-24 19:12 ` Wolfgang Denk
@ 2011-10-24 19:26 ` Albert ARIBAUD
0 siblings, 0 replies; 6+ messages in thread
From: Albert ARIBAUD @ 2011-10-24 19:26 UTC (permalink / raw)
To: u-boot
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-10-24 19:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-24 5:42 [U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage Heiko Schocher
2011-10-24 9:15 ` Marek Vasut
2011-10-24 19:24 ` Wolfgang Denk
2011-10-24 16:28 ` Albert ARIBAUD
2011-10-24 19:12 ` Wolfgang Denk
2011-10-24 19:26 ` Albert ARIBAUD
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox