summaryrefslogtreecommitdiff
path: root/board/mpl/vcma9/vcma9.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-08-07 22:33:06 +0200
committerWolfgang Denk <wd@denx.de>2010-08-07 22:33:06 +0200
commit3df4f46f3209c067dcadc969ed02d27c97fa3632 (patch)
tree4639307e5e9120b0c80c62da8376be3e406e84fb /board/mpl/vcma9/vcma9.c
parent9efac4a1eb99d9c5539aa6992025eeacab7980c6 (diff)
parentc519facc645812c6d174c2d5b60241d23e285642 (diff)
downloadu-boot-imx-3df4f46f3209c067dcadc969ed02d27c97fa3632.zip
u-boot-imx-3df4f46f3209c067dcadc969ed02d27c97fa3632.tar.gz
u-boot-imx-3df4f46f3209c067dcadc969ed02d27c97fa3632.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'board/mpl/vcma9/vcma9.c')
-rw-r--r--board/mpl/vcma9/vcma9.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c
index 1835677..eaeec82 100644
--- a/board/mpl/vcma9/vcma9.c
+++ b/board/mpl/vcma9/vcma9.c
@@ -295,7 +295,7 @@ int checkboard(void)
int i;
backup_t *b = (backup_t *) s;
- i = getenv_r("serial#", s, 32);
+ i = getenv_f("serial#", s, 32);
if ((i < 0) || strncmp (s, "VCMA9", 5)) {
get_backup_values (b);
if (strncmp (b->signature, "MPL\0", 4) != 0) {
@@ -340,7 +340,7 @@ void print_vcma9_info(void)
char s[50];
int i;
- if ((i = getenv_r("serial#", s, 32)) < 0) {
+ if ((i = getenv_f("serial#", s, 32)) < 0) {
puts ("### No HW ID - assuming VCMA9");
printf("i %d", i*24);
} else {