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/amcc/sequoia/sequoia.c | |
| parent | a02a884b95c47e114a54f2751d03f139f312af2f (diff) | |
| download | olio-uboot-2014.01-f0c0b3a9e6f28a34d6da5edabba1e874fdf8e675.tar.xz olio-uboot-2014.01-f0c0b3a9e6f28a34d6da5edabba1e874fdf8e675.zip | |
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/amcc/sequoia/sequoia.c')
| -rw-r--r-- | board/amcc/sequoia/sequoia.c | 7 | 
1 files changed, 4 insertions, 3 deletions
| diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c index b518aa7d7..45e87f763 100644 --- a/board/amcc/sequoia/sequoia.c +++ b/board/amcc/sequoia/sequoia.c @@ -331,7 +331,8 @@ int misc_init_r(void)  int checkboard(void)  { -	char *s = getenv("serial#"); +	char buf[64]; +	int i = getenv_f("serial#", buf, sizeof(buf));  	u8 rev;  	u32 clock = get_async_pci_freq(); @@ -344,9 +345,9 @@ int checkboard(void)  	rev = in_8((void *)(CONFIG_SYS_BCSR_BASE + 0));  	printf(", Rev. %X, PCI-Async=%d MHz", rev, clock / 1000000); -	if (s != NULL) { +	if (i > 0) {  		puts(", serial# "); -		puts(s); +		puts(buf);  	}  	putc('\n'); |