summaryrefslogtreecommitdiff
path: root/board/Marvell/db64360/mv_eth.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/Marvell/db64360/mv_eth.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/Marvell/db64360/mv_eth.c')
-rw-r--r--board/Marvell/db64360/mv_eth.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/Marvell/db64360/mv_eth.c b/board/Marvell/db64360/mv_eth.c
index d1ac0c5..30304b0 100644
--- a/board/Marvell/db64360/mv_eth.c
+++ b/board/Marvell/db64360/mv_eth.c
@@ -248,7 +248,7 @@ void mv6436x_eth_initialize (bd_t * bis)
return;
}
- temp = getenv_r (s, buf, sizeof (buf));
+ temp = getenv_f(s, buf, sizeof (buf));
s = (temp > 0) ? buf : NULL;
#ifdef DEBUG
@@ -351,7 +351,7 @@ void mv6436x_eth_initialize (bd_t * bis)
return;
}
- temp = getenv_r (s, buf, sizeof (buf));
+ temp = getenv_f(s, buf, sizeof (buf));
s = (temp > 0) ? buf : NULL;
#ifdef DEBUG