Patchwork [U-Boot] arch/arm/lib/board.c: fix build error

login
register
mail settings
Submitter Wolfgang Denk
Date Oct. 23, 2011, 9:51 p.m.
Message ID <1319406671-6360-1-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/121252/
State Not Applicable
Headers show

Comments

Wolfgang Denk - Oct. 23, 2011, 9:51 p.m.
Commit dc8bbea "arm: Use getenv_ulong() in place of getenv(), strtoul"
introduced a build error for all ARM boards with network support:

board.c: In function 'board_init_r':
board.c:569: error: 's' undeclared (first use in this function)
board.c:569: error: (Each undeclared identifier is reported only once
board.c:569: error: for each function it appears in.)

Fix it.

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 arch/arm/lib/board.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
Simon Glass - Oct. 24, 2011, 12:29 a.m.
Hi Wolfgang,

On Sun, Oct 23, 2011 at 2:51 PM, Wolfgang Denk <wd@denx.de> wrote:
> Commit dc8bbea "arm: Use getenv_ulong() in place of getenv(), strtoul"
> introduced a build error for all ARM boards with network support:
>
> board.c: In function 'board_init_r':
> board.c:569: error: 's' undeclared (first use in this function)
> board.c:569: error: (Each undeclared identifier is reported only once
> board.c:569: error: for each function it appears in.)
>
> Fix it.

This might fix all boards if they have both net and flash, or neither.
But I sent a patch which tries to handle the case where we have one
but not the other.

(I suspect the PPC warning might be similar, but will wait until I
have done a MAKEALL before commenting on that)

Regards,
Simon

>
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> ---
>  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 c764844..367cf6b 100644
> --- a/arch/arm/lib/board.c
> +++ b/arch/arm/lib/board.c
> @@ -441,6 +441,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.2
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>
Heiko Schocher - Oct. 24, 2011, 7 a.m.
Hello Wolfgang,

Wolfgang Denk wrote:
> Commit dc8bbea "arm: Use getenv_ulong() in place of getenv(), strtoul"
> introduced a build error for all ARM boards with network support:
> 
> board.c: In function 'board_init_r':
> board.c:569: error: 's' undeclared (first use in this function)
> board.c:569: error: (Each undeclared identifier is reported only once
> board.c:569: error: for each function it appears in.)
> 
> Fix it.
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>

posted a patch too, see your fix too late, sorry, so
forget my patch:

Acked-by: Heiko Schocher <hs@denx.de>

for this.

Thanks for fixing.

bye,
Heiko

Patch

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index c764844..367cf6b 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -441,6 +441,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;