summaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-08-19 09:33:41 -0600
committerJoe Hershberger <joe.hershberger@ni.com>2015-08-21 16:33:39 -0500
commitc294ac5c16f5ad5107b051f4a0de46d04d8ce13b (patch)
treea599f99cbefb4a7025b06204aae86bb25acf5371 /drivers/net/e1000.c
parentc6d80a152207f6fad5a8e79bf1005fdbabb16d12 (diff)
downloadblackbird-obmc-uboot-c294ac5c16f5ad5107b051f4a0de46d04d8ce13b.tar.gz
blackbird-obmc-uboot-c294ac5c16f5ad5107b051f4a0de46d04d8ce13b.zip
net: e1000: Add Kconfig options
Add Kconfig options in preparation for moving boards to use Kconfig. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'drivers/net/e1000.c')
-rw-r--r--drivers/net/e1000.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 412ed1450d..6f74d304d1 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -1221,13 +1221,6 @@ e1000_read_mac_addr(struct e1000_hw *hw, unsigned char enetaddr[6])
if (e1000_is_second_port(hw))
enetaddr[5] ^= 1;
-#ifdef CONFIG_E1000_FALLBACK_MAC
- if (!is_valid_ethaddr(nic->enetaddr)) {
- unsigned char fb_mac[NODE_ADDRESS_SIZE] = CONFIG_E1000_FALLBACK_MAC;
-
- memcpy(enetaddr, fb_mac, NODE_ADDRESS_SIZE);
- }
-#endif
return 0;
}
#endif
OpenPOWER on IntegriCloud