diff options
| author | Simon Glass <sjg@chromium.org> | 2015-08-19 09:33:41 -0600 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2015-08-21 16:33:39 -0500 |
| commit | c294ac5c16f5ad5107b051f4a0de46d04d8ce13b (patch) | |
| tree | a599f99cbefb4a7025b06204aae86bb25acf5371 | |
| parent | c6d80a152207f6fad5a8e79bf1005fdbabb16d12 (diff) | |
| download | blackbird-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>
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 32 | ||||
| -rw-r--r-- | drivers/net/e1000.c | 7 |
3 files changed, 32 insertions, 10 deletions
@@ -1382,9 +1382,6 @@ The following options need to be configured: Management command for E1000 devices. When used on devices with SPI support you can reprogram the EEPROM from U-Boot. - CONFIG_E1000_FALLBACK_MAC - default MAC for empty EEPROM after production. - CONFIG_EEPRO100 Support for Intel 82557/82559/82559ER chips. Optional CONFIG_EEPRO100_SROM_WRITE enables EEPROM diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ce76a02da0..7367d9e5ac 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -20,6 +20,38 @@ menuconfig NETDEVICES if NETDEVICES +config E1000 + bool "Intel PRO/1000 Gigabit Ethernet support" + help + This driver supports Intel(R) PRO/1000 gigabit ethernet family of + adapters. For more information on how to identify your adapter, go + to the Adapter & Driver ID Guide at: + + <http://support.intel.com/support/network/adapter/pro100/21397.htm> + +config E1000_SPI_GENERIC + bool "Allow access to the Intel 8257x SPI bus" + depends on E1000 + help + Allow generic access to the SPI bus on the Intel 8257x, for + example with the "sspi" command. + +config E1000_SPI + bool "Enable SPI bus utility code" + depends on E1000 + help + Utility code for direct access to the SPI bus on Intel 8257x. + This does not do anything useful unless you set at least one + of CONFIG_CMD_E1000 or CONFIG_E1000_SPI_GENERIC. + +config CMD_E1000 + bool "Enable the e1000 command" + depends on E1000 + help + This enables the 'e1000' management command for E1000 devices. When + used on devices with SPI support you can reprogram the EEPROM from + U-Boot. + config ETH_SANDBOX depends on DM_ETH && SANDBOX default y 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 |
