[U-Boot] [PATCH 2/3] net: e1000: Remove CONFIG_MVBC_1G

Bin Meng bmeng.cn at gmail.com
Mon Nov 16 10:19:17 CET 2015


CONFIG_MVBC_1G is not referenced anywhere, hence remove it.

Signed-off-by: Bin Meng <bmeng.cn at gmail.com>
---

 drivers/net/e1000.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 508ebfb..6be2d9f 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -5286,7 +5286,6 @@ static int e1000_init_one(struct e1000_hw *hw, int cardnum, pci_dev_t devno,
 
 #ifndef CONFIG_E1000_NO_NVM
 	/* Validate the EEPROM and get chipset information */
-#if !defined(CONFIG_MVBC_1G)
 	if (e1000_init_eeprom_params(hw)) {
 		E1000_ERR(hw, "EEPROM is invalid!\n");
 		return -EINVAL;
@@ -5294,7 +5293,6 @@ static int e1000_init_one(struct e1000_hw *hw, int cardnum, pci_dev_t devno,
 	if ((E1000_READ_REG(hw, I210_EECD) & E1000_EECD_FLUPD) &&
 	    e1000_validate_eeprom_checksum(hw))
 		return -ENXIO;
-#endif
 	e1000_read_mac_addr(hw, enetaddr);
 #endif
 	e1000_get_bus_type(hw);
-- 
1.8.2.1



More information about the U-Boot mailing list