summaryrefslogtreecommitdiff
path: root/board/amirix
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-05-04 10:32:28 +0000
committerWolfgang Denk <wd@denx.de>2011-05-12 19:48:42 +0200
commitf0c0b3a9e6f28a34d6da5edabba1e874fdf8e675 (patch)
treeb48adf0159f02551ab3318f469b085cfa0b26bb8 /board/amirix
parenta02a884b95c47e114a54f2751d03f139f312af2f (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/amirix')
-rw-r--r--board/amirix/ap1000/ap1000.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/board/amirix/ap1000/ap1000.c b/board/amirix/ap1000/ap1000.c
index c8dd99eb4cb..64de04ca29d 100644
--- a/board/amirix/ap1000/ap1000.c
+++ b/board/amirix/ap1000/ap1000.c
@@ -37,8 +37,8 @@ int board_pre_init (void)
/** serial number and platform display at startup */
int checkboard (void)
{
- char *s = getenv ("serial#");
- char *e;
+ char buf[64];
+ int l = getenv_f("serial#", buf, sizeof(buf));
/* After a loadace command, the SystemAce control register is left in a wonky state. */
/* this code did not work in board_pre_init */
@@ -115,17 +115,19 @@ int checkboard (void)
puts ("Serial#: ");
- if (!s) {
+ if (l < 0) {
printf ("### No HW ID - assuming AMIRIX");
} else {
- for (e = s; *e; ++e) {
- if (*e == ' ')
+ int i;
+
+ for (i = 0; i < l; ++i) {
+ if (buf[i] == ' ') {
+ buf[i] = '\0';
break;
+ }
}
- for (; s < e; ++s) {
- putc (*s);
- }
+ puts(buf);
}
putc ('\n');
@@ -136,9 +138,11 @@ int checkboard (void)
phys_size_t initdram (int board_type)
{
- char *s = getenv ("dramsize");
+ char buf[64];
+ int i = getenv_f("dramsize", buf, sizeof(buf));
- if (s != NULL) {
+ if (i > 0) {
+ char *s = buf;
if ((s[0] == '0') && ((s[1] == 'x') || (s[1] == 'X'))) {
s += 2;
}