diff options
| author | Wolfgang Denk | 2011-05-04 10:32:28 +0000 |
|---|---|---|
| committer | Wolfgang Denk | 2011-05-12 19:48:42 +0200 |
| commit | f0c0b3a9e6f28a34d6da5edabba1e874fdf8e675 (patch) | |
| tree | b48adf0159f02551ab3318f469b085cfa0b26bb8 /board/socrates | |
| parent | a02a884b95c47e114a54f2751d03f139f312af2f (diff) | |
Fix incorrect use of getenv() before relocation
A large number of boards incorrectly used getenv() in their board init
code running before relocation. In some cases this caused U-Boot to
hang when certain environment variables grew too long.
Fix the code to use getenv_r().
Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
Cc: The LEOX team <team@leox.org>
Cc: Michael Schwingen <michael@schwingen.org>
Cc: Georg Schardt <schardt@team-ctech.de>
Cc: Werner Pfister <Pfister_Werner@intercontrol.de>
Cc: Dirk Eibach <eibach@gdsys.de>
Cc: Peter De Schrijver <p2@mind.be>
Cc: John Zhan <zhanz@sinovee.com>
Cc: Rishi Bhattacharya <rishi@ti.com>
Cc: Peter Tyser <ptyser@xes-inc.com>
Diffstat (limited to 'board/socrates')
| -rw-r--r-- | board/socrates/socrates.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c index 72e7401f14c..65fb70ad730 100644 --- a/board/socrates/socrates.c +++ b/board/socrates/socrates.c @@ -52,15 +52,17 @@ ulong flash_get_size (ulong base, int banknum); int checkboard (void) { volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); - - char *src; + char buf[64]; int f; - char *s = getenv("serial#"); + int i = getenv_f("serial#", buf, sizeof(buf)); +#ifdef CONFIG_PCI + char *src; +#endif puts("Board: Socrates"); - if (s != NULL) { + if (i > 0) { puts(", serial# "); - puts(s); + puts(buf); } putc('\n'); |