projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot
[oweals/u-boot.git]
/
drivers
/
net
/
macb.c
diff --git
a/drivers/net/macb.c
b/drivers/net/macb.c
index 4e1a7fe58398843a6192da01522d8d9a24c278b2..f9491617382ca2659078d047d6d4f31a794f4f64 100644
(file)
--- a/
drivers/net/macb.c
+++ b/
drivers/net/macb.c
@@
-525,7
+525,6
@@
static int macb_phy_init(struct macb_device *macb)
return 1;
}
return 1;
}
-static int macb_write_hwaddr(struct eth_device *dev);
static int macb_init(struct eth_device *netdev, bd_t *bd)
{
struct macb_device *macb = to_macb(netdev);
static int macb_init(struct eth_device *netdev, bd_t *bd)
{
struct macb_device *macb = to_macb(netdev);
@@
-594,14
+593,6
@@
static int macb_init(struct eth_device *netdev, bd_t *bd)
#endif /* CONFIG_RMII */
}
#endif /* CONFIG_RMII */
}
- /* update the ethaddr */
- if (is_valid_ethaddr(netdev->enetaddr)) {
- macb_write_hwaddr(netdev);
- } else {
- printf("%s: mac address is not valid\n", netdev->name);
- return -1;
- }
-
if (!macb_phy_init(macb))
return -1;
if (!macb_phy_init(macb))
return -1;