[U-Boot] [PATCH] e1000: fix no nvm build

Marcel Ziswiler marcel at ziswiler.com
Mon Sep 8 00:02:11 CEST 2014


Fix the following build error in case CONFIG_E1000_NO_NVM is enabled:
	  CC      drivers/net/e1000.o
	drivers/net/e1000.c: In function ‘e1000_initialize’:
	drivers/net/e1000.c:5365:5: error: ‘struct e1000_hw’ has no
		member named ‘eeprom_semaphore_present’
	make[1]: *** [drivers/net/e1000.o] Error 1
	make: *** [drivers/net] Error 2
--
This got introduced by Marek's i210 support patch commit
951860634fdb557bbb58e0f99215391bc0c29779.

Signed-off-by: Marcel Ziswiler <marcel at ziswiler.com>
---
 drivers/net/e1000.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 0eba57c..6e8765c 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -5362,7 +5362,9 @@ e1000_initialize(bd_t * bis)
 		hw->autoneg_failed = 0;
 		hw->autoneg = 1;
 		hw->get_link_status = true;
+#ifndef CONFIG_E1000_NO_NVM
 		hw->eeprom_semaphore_present = true;
+#endif
 		hw->hw_addr = pci_map_bar(devno,	PCI_BASE_ADDRESS_0,
 							PCI_REGION_MEM);
 		hw->mac_type = e1000_undefined;
-- 
1.9.3



More information about the U-Boot mailing list