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/xes | |
| 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/xes')
| -rw-r--r-- | board/xes/common/board.c | 17 | ||||
| -rw-r--r-- | board/xes/xpedite1000/xpedite1000.c | 21 |
2 files changed, 22 insertions, 16 deletions
diff --git a/board/xes/common/board.c b/board/xes/common/board.c index 738f0a6486b..4e60bb50557 100644 --- a/board/xes/common/board.c +++ b/board/xes/common/board.c @@ -13,7 +13,9 @@ int checkboard(void) { char name[] = CONFIG_SYS_BOARD_NAME; + char buf[64]; char *s; + int i; #ifdef CONFIG_SYS_FORM_CUSTOM s = "Custom"; @@ -52,12 +54,15 @@ int checkboard(void) /* Display board specific information */ puts(" "); - if ((s = getenv("board_rev"))) - printf("Rev %s, ", s); - if ((s = getenv("serial#"))) - printf("Serial# %s, ", s); - if ((s = getenv("board_cfg"))) - printf("Cfg %s", s); + i = getenv_f("board_rev", buf, sizeof(buf)); + if (i > 0) + printf("Rev %s, ", buf); + i = getenv_f("serial#", buf, sizeof(buf)); + if (i > 0) + printf("Serial# %s, ", buf); + i = getenv_f("board_cfg", buf, sizeof(buf)); + if (i > 0) + printf("Cfg %s", buf); puts("\n"); return 0; diff --git a/board/xes/xpedite1000/xpedite1000.c b/board/xes/xpedite1000/xpedite1000.c index a3534d2d7ab..4b0ee9281f1 100644 --- a/board/xes/xpedite1000/xpedite1000.c +++ b/board/xes/xpedite1000/xpedite1000.c @@ -112,19 +112,20 @@ int board_early_init_f(void) int checkboard(void) { - char *s; + char buf[64]; + int i; printf("Board: X-ES %s PMC SBC\n", CONFIG_SYS_BOARD_NAME); printf(" "); - s = getenv("board_rev"); - if (s) - printf("Rev %s, ", s); - s = getenv("serial#"); - if (s) - printf("Serial# %s, ", s); - s = getenv("board_cfg"); - if (s) - printf("Cfg %s", s); + i = getenv_f("board_rev", buf, sizeof(buf)); + if (i > 0) + printf("Rev %s, ", buf); + i = getenv_f("serial#", buf, sizeof(buf)); + if (i > 0) + printf("Serial# %s, ", buf); + i = getenv_f("board_cfg", buf, sizeof(buf)); + if (i > 0) + printf("Cfg %s", buf); printf("\n"); return 0; |