summaryrefslogtreecommitdiff
path: root/board/gdsys/dlvision
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/gdsys/dlvision
parenta02a884b95c47e114a54f2751d03f139f312af2f (diff)
downloadu-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/gdsys/dlvision')
-rw-r--r--board/gdsys/dlvision/dlvision.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/board/gdsys/dlvision/dlvision.c b/board/gdsys/dlvision/dlvision.c
index 3499bdc..5c70326 100644
--- a/board/gdsys/dlvision/dlvision.c
+++ b/board/gdsys/dlvision/dlvision.c
@@ -75,7 +75,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 channel2_msr = in_8((void *)CONFIG_UART_BASE + 0x26);
u8 channel3_msr = in_8((void *)CONFIG_UART_BASE + 0x36);
u8 channel7_msr = in_8((void *)CONFIG_UART_BASE + 0x76);
@@ -108,9 +109,9 @@ int checkboard(void)
break;
}
- if (s != NULL) {
+ if (i > 0) {
puts(", serial# ");
- puts(s);
+ puts(buf);
}
puts("\n ");