summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorTerry Lv <r65388@freescale.com>2010-01-08 15:30:26 +0800
committerTerry Lv <r65388@freescale.com>2010-01-11 19:32:42 +0800
commita5510c49adac4e31c0bc13bad45ee073b3940dc5 (patch)
treeb803d30b72344e2a95fbfed78d939d813e378036 /net
parentc3b0a8706e5b3eb84875830e9acaa80cac088c14 (diff)
ENGR00119890: Set right mac addr to FEC register in init
The mac addr set to FEC is smc911x's. So add a environment "fec_addr" to set fec address. Signed-off-by: Terry Lv <r65388@freescale.com>
Diffstat (limited to 'net')
-rw-r--r--net/eth.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/net/eth.c b/net/eth.c
index 7e4b187f5fa..22007678f62 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -2,7 +2,7 @@
* (C) Copyright 2001-2004
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
- * (C) Copyright 2008-2009 Freescale Semiconductor, Inc.
+ * (C) Copyright 2008-2010 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -201,13 +201,8 @@ int eth_initialize(bd_t *bis)
#endif
/* Try board-specific initialization first. If it fails or isn't
* present, try the cpu-specific initialization */
-#ifdef CONFIG_ETHPRIME
- board_eth_init(bis);
- cpu_eth_init(bis);
-#else
if (board_eth_init(bis) < 0)
cpu_eth_init(bis);
-#endif
#if defined(CONFIG_DB64360) || defined(CONFIG_CPCI750)
mv6436x_eth_initialize(bis);