public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Wolfgang Denk <wd@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage
Date: Mon, 24 Oct 2011 21:12:09 +0200	[thread overview]
Message-ID: <20111024191209.4F2FD14094B3@gemini.denx.de> (raw)
In-Reply-To: <4EA59236.4000607@aribaud.net>

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

  reply	other threads:[~2011-10-24 19:12 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
2011-10-24 19:26     ` Albert ARIBAUD

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111024191209.4F2FD14094B3@gemini.denx.de \
    --to=wd@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox