From mboxrd@z Thu Jan  1 00:00:00 1970
From: Wolfgang Denk <wd@denx.de>
Date: Mon, 24 Oct 2011 21:23:07 +0200
Subject: [U-Boot] [PATCH] Fix compile issue in arch/arm/lib/board.c
In-Reply-To: <1319447521-6020-1-git-send-email-marek.vasut@gmail.com>
References: <1319447521-6020-1-git-send-email-marek.vasut@gmail.com>
Message-ID: <20111024192307.796C414094B3@gemini.denx.de>
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

Dear Marek Vasut,

In message <1319447521-6020-1-git-send-email-marek.vasut@gmail.com> you wrote:
> The commit dc8bbea0170eb2aca428ea221c91fc2e5e11f199 breaks the build of U-Boot
> if CONFIG_CMD_NET is enabled.
> 
> arm: Use getenv_ulong() in place of getenv(), strtoul
> 
> This changes the board code to use the new getenv_ulong() function.
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> ---
>  arch/arm/lib/board.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
> index c764844..558e973 100644
> --- a/arch/arm/lib/board.c
> +++ b/arch/arm/lib/board.c
> @@ -566,7 +566,7 @@ void board_init_r(gd_t *id, ulong dest_addr)
>  	/* Initialize from environment */
>  	load_addr = getenv_ulong("loadaddr", 16, load_addr);
>  #if defined(CONFIG_CMD_NET)
> -	s = getenv("bootfile");
> +	char *s = getenv("bootfile");

Never mix declarations with code.

[no need to resubmit, I applied Simon's patch instead.]

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
If all you have is a hammer, everything looks like a nail.