From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Mon, 24 Oct 2011 21:26:41 +0200
Subject: [U-Boot] [PATCH] [BUG] arm, lib: fix compile breakage
In-Reply-To: <20111024191209.4F2FD14094B3@gemini.denx.de>
References: <1319434952-10971-1-git-send-email-hs@denx.de>
	<4EA59236.4000607@aribaud.net>
	<20111024191209.4F2FD14094B3@gemini.denx.de>
Message-ID: <4EA5BBF1.1010600@aribaud.net>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

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.