summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-12-09 20:52:44 +0100
committerWolfgang Denk <wd@denx.de>2010-12-09 20:52:44 +0100
commitac8983bcba75576c50307b5e8dc8fb848740ee61 (patch)
treee514ad2f915afd2af270d13bce4eb15605887283 /drivers/net
parent7ea23555f5d59457f5998b9f61d7b943b2ea6422 (diff)
parent565e39c57769a45a5eaed5e4c86357e817cf64e1 (diff)
downloadu-boot-imx-ac8983bcba75576c50307b5e8dc8fb848740ee61.zip
u-boot-imx-ac8983bcba75576c50307b5e8dc8fb848740ee61.tar.gz
u-boot-imx-ac8983bcba75576c50307b5e8dc8fb848740ee61.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-imx
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/fec_mxc.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index c17f937..0d0f392 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -312,21 +312,8 @@ static void fec_rbd_clean(int last, struct fec_bd *pRbd)
static int fec_get_hwaddr(struct eth_device *dev, unsigned char *mac)
{
-/*
- * The MX27 can store the mac address in internal eeprom
- * This mechanism is not supported now by MX51 or MX25
- */
-#if defined(CONFIG_MX51) || defined(CONFIG_MX25)
- return -1;
-#else
- struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
- int i;
-
- for (i = 0; i < 6; i++)
- mac[6-1-i] = readl(&iim->iim_bank_area0[IIM0_MAC + i]);
-
+ imx_get_mac_from_fuse(mac);
return !is_valid_ether_addr(mac);
-#endif
}
static int fec_set_hwaddr(struct eth_device *dev)
@@ -754,7 +741,7 @@ static int fec_probe(bd_t *bd)
eth_register(edev);
if (fec_get_hwaddr(edev, ethaddr) == 0) {
- printf("got MAC address from EEPROM: %pM\n", ethaddr);
+ printf("got MAC address from fuse: %pM\n", ethaddr);
memcpy(edev->enetaddr, ethaddr, 6);
}