Dear Marek Vasut, In message <[email protected]> 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 <[email protected]> > Cc: Simon Glass <[email protected]> > Cc: Wolfgang Denk <[email protected]> > Cc: Albert ARIBAUD <[email protected]> > --- > 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: [email protected] If all you have is a hammer, everything looks like a nail. _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
