summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-01-23 14:20:49 +0100
committerWolfgang Denk <wd@denx.de>2008-01-23 14:20:49 +0100
commit2468592d79891fea4f39d0a414c7316f3af03f4c (patch)
treec1fc8b7d4306e4930e5afd63793decb10be2166c /net
parent8f00731818f0f0deaca899bde56de98d3d95c0b6 (diff)
parente16925773211291b562e77187061e9dd1d757217 (diff)
downloadu-boot-imx-2468592d79891fea4f39d0a414c7316f3af03f4c.zip
u-boot-imx-2468592d79891fea4f39d0a414c7316f3af03f4c.tar.gz
u-boot-imx-2468592d79891fea4f39d0a414c7316f3af03f4c.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-net
Diffstat (limited to 'net')
-rw-r--r--net/eth.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/net/eth.c b/net/eth.c
index 5d9e9c1..316e817 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -217,6 +217,9 @@ int eth_initialize(bd_t *bis)
#if defined(CONFIG_UEC_ETH3)
uec_initialize(2);
#endif
+#if defined(CONFIG_UEC_ETH4)
+ uec_initialize(3);
+#endif
#if defined(FEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
fec_initialize(bis);
@@ -522,6 +525,15 @@ int eth_receive(volatile void *packet, int length)
void eth_try_another(int first_restart)
{
static struct eth_device *first_failed = NULL;
+ char *ethrotate;
+
+ /*
+ * Do not rotate between network interfaces when
+ * 'ethrotate' variable is set to 'no'.
+ */
+ if (((ethrotate = getenv ("ethrotate")) != NULL) &&
+ (strcmp(ethrotate, "no") == 0))
+ return;
if (!eth_current)
return;