diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-05-04 10:32:28 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-05-12 19:48:42 +0200 |
| commit | f0c0b3a9e6f28a34d6da5edabba1e874fdf8e675 (patch) | |
| tree | b48adf0159f02551ab3318f469b085cfa0b26bb8 /board/etx094 | |
| parent | a02a884b95c47e114a54f2751d03f139f312af2f (diff) | |
| download | u-boot-imx-f0c0b3a9e6f28a34d6da5edabba1e874fdf8e675.zip u-boot-imx-f0c0b3a9e6f28a34d6da5edabba1e874fdf8e675.tar.gz u-boot-imx-f0c0b3a9e6f28a34d6da5edabba1e874fdf8e675.tar.bz2 | |
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/etx094')
| -rw-r--r-- | board/etx094/etx094.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/board/etx094/etx094.c b/board/etx094/etx094.c index d6f638a..abefe4a 100644 --- a/board/etx094/etx094.c +++ b/board/etx094/etx094.c @@ -92,8 +92,9 @@ const uint sdram_table[] = { int checkboard (void) { - char *s = getenv ("serial#"); - char *e; + char buf[64]; + int i; + int l = getenv_f("serial#", buf, sizeof(buf)); puts ("Board: "); @@ -103,19 +104,16 @@ int checkboard (void) gd->board_type = 1; /* 1 = 1SDRAM-Device */ #endif - if (!s || strncmp (s, "ETX_", 4)) { + if (l < 0 || strncmp(buf, "ETX_", 4)) { puts ("### No HW ID - assuming ETX_094\n"); read_hw_vers (); return (0); } - for (e = s; *e; ++e) { - if (*e == ' ') + for (i = 0; i < l; ++i) { + if (buf[i] == ' ') break; - } - - for (; s < e; ++s) { - putc (*s); + putc(buf[i]); } putc ('\n'); |