From f0c0b3a9e6f28a34d6da5edabba1e874fdf8e675 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Wed, 4 May 2011 10:32:28 +0000 Subject: 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 Cc: Stefan Roese Cc: The LEOX team Cc: Michael Schwingen Cc: Georg Schardt Cc: Werner Pfister Cc: Dirk Eibach Cc: Peter De Schrijver Cc: John Zhan Cc: Rishi Bhattacharya Cc: Peter Tyser --- board/gdsys/405ep/dlvision-10g.c | 7 ++++--- board/gdsys/405ep/io.c | 7 ++++--- board/gdsys/405ep/iocon.c | 7 ++++--- board/gdsys/dlvision/dlvision.c | 7 ++++--- board/gdsys/gdppc440etx/gdppc440etx.c | 7 ++++--- board/gdsys/intip/intip.c | 7 ++++--- board/gdsys/neo/neo.c | 7 ++++--- 7 files changed, 28 insertions(+), 21 deletions(-) (limited to 'board/gdsys') diff --git a/board/gdsys/405ep/dlvision-10g.c b/board/gdsys/405ep/dlvision-10g.c index 038854161f..ecba66ec71 100644 --- a/board/gdsys/405ep/dlvision-10g.c +++ b/board/gdsys/405ep/dlvision-10g.c @@ -225,15 +225,16 @@ static void print_fpga_info(unsigned dev) */ int checkboard(void) { - char *s = getenv("serial#"); + char buf[64]; + int i = getenv_f("serial#", buf, sizeof(buf)); printf("Board: "); printf("DLVision 10G"); - if (s != NULL) { + if (i > 0) { puts(", serial# "); - puts(s); + puts(buf); } puts("\n"); diff --git a/board/gdsys/405ep/io.c b/board/gdsys/405ep/io.c index 0974019ef7..db1ea7f0c5 100644 --- a/board/gdsys/405ep/io.c +++ b/board/gdsys/405ep/io.c @@ -87,8 +87,9 @@ err_out: */ int checkboard(void) { + char buf[64]; + int i = getenv_f("serial#", buf, sizeof(buf)); ihs_fpga_t *fpga = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(0); - char *s = getenv("serial#"); u16 versions = in_le16(&fpga->versions); u16 fpga_version = in_le16(&fpga->fpga_version); u16 fpga_features = in_le16(&fpga->fpga_features); @@ -106,9 +107,9 @@ int checkboard(void) printf("CATCenter Io"); - if (s != NULL) { + if (i > 0) { puts(", serial# "); - puts(s); + puts(buf); } puts("\n "); diff --git a/board/gdsys/405ep/iocon.c b/board/gdsys/405ep/iocon.c index 20770e4eff..ce53340894 100644 --- a/board/gdsys/405ep/iocon.c +++ b/board/gdsys/405ep/iocon.c @@ -69,8 +69,9 @@ enum { */ int checkboard(void) { + char buf[64]; + int i = getenv_f("serial#", buf, sizeof(buf)); ihs_fpga_t *fpga = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(0); - char *s = getenv("serial#"); u16 versions = in_le16(&fpga->versions); u16 fpga_version = in_le16(&fpga->fpga_version); u16 fpga_features = in_le16(&fpga->fpga_features); @@ -98,9 +99,9 @@ int checkboard(void) printf("IoCon"); - if (s != NULL) { + if (i > 0) { puts(", serial# "); - puts(s); + puts(buf); } puts("\n "); diff --git a/board/gdsys/dlvision/dlvision.c b/board/gdsys/dlvision/dlvision.c index 3499bdc685..5c70326d50 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 "); diff --git a/board/gdsys/gdppc440etx/gdppc440etx.c b/board/gdsys/gdppc440etx/gdppc440etx.c index 328eb95aa3..c58411ee88 100644 --- a/board/gdsys/gdppc440etx/gdppc440etx.c +++ b/board/gdsys/gdppc440etx/gdppc440etx.c @@ -145,13 +145,14 @@ int misc_init_r(void) int checkboard(void) { - char *s = getenv("serial#"); + char buf[64]; + int i = getenv_f("serial#", buf, sizeof(buf)); printf("Board: GDPPC440ETX - G&D PPC440EP/GR ETX-module"); - if (s != NULL) { + if (i > 0) { puts(", serial# "); - puts(s); + puts(buf); } putc('\n'); diff --git a/board/gdsys/intip/intip.c b/board/gdsys/intip/intip.c index aa85ea416a..0132b2595d 100644 --- a/board/gdsys/intip/intip.c +++ b/board/gdsys/intip/intip.c @@ -124,7 +124,8 @@ int get_cpu_num(void) int checkboard(void) { - char *s = getenv("serial#"); + char buf[64]; + int i = getenv_f("serial#", buf, sizeof(buf)); #ifdef CONFIG_DEVCONCENTER printf("Board: DevCon-Center"); @@ -132,9 +133,9 @@ int checkboard(void) printf("Board: Intip"); #endif - if (s != NULL) { + if (i > 0) { puts(", serial# "); - puts(s); + puts(buf); } putc('\n'); diff --git a/board/gdsys/neo/neo.c b/board/gdsys/neo/neo.c index a56c2cc987..d21d599fa7 100644 --- a/board/gdsys/neo/neo.c +++ b/board/gdsys/neo/neo.c @@ -53,7 +53,8 @@ int board_early_init_f(void) */ int checkboard(void) { - char *s = getenv("serial#"); + char buf[64]; + int i = getenv_f("serial#", buf, sizeof(buf)); u16 val = in_le16((void *)CONFIG_FPGA_BASE + 2); u8 unit_type; u8 hardware_cpu_ports; @@ -62,9 +63,9 @@ int checkboard(void) printf("Board: CATCenter Neo"); - if (s != NULL) { + if (i > 0) { puts(", serial# "); - puts(s); + puts(buf); } puts("\n "); -- cgit v1.2.1