diff options
| author | Tom Rini <trini@ti.com> | 2013-11-25 10:42:19 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-25 10:42:19 -0500 |
| commit | 1a1326d2da9b2904bc90fb2990f829cb1ecef312 (patch) | |
| tree | 79b47ce3f6bbc48974d305eedebd0e473dc9a33d /drivers/net/e1000.h | |
| parent | faca8ff55f4a2cf45fb906cc37f44601149fc00e (diff) | |
| parent | 2287286be4e268d3d4ec3c0347bf31479dbd1f05 (diff) | |
| download | olio-uboot-2014.01-1a1326d2da9b2904bc90fb2990f829cb1ecef312.tar.xz olio-uboot-2014.01-1a1326d2da9b2904bc90fb2990f829cb1ecef312.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/net/e1000.h')
| -rw-r--r-- | drivers/net/e1000.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h index 25884f5bc..ff87af2ef 100644 --- a/drivers/net/e1000.h +++ b/drivers/net/e1000.h @@ -63,11 +63,14 @@ struct e1000_hw_stats; /* Internal E1000 helper functions */ struct e1000_hw *e1000_find_card(unsigned int cardnum); + +#ifndef CONFIG_E1000_NO_NVM int32_t e1000_acquire_eeprom(struct e1000_hw *hw); void e1000_standby_eeprom(struct e1000_hw *hw); void e1000_release_eeprom(struct e1000_hw *hw); void e1000_raise_ee_clk(struct e1000_hw *hw, uint32_t *eecd); void e1000_lower_ee_clk(struct e1000_hw *hw, uint32_t *eecd); +#endif #ifdef CONFIG_E1000_SPI int do_e1000_spi(cmd_tbl_t *cmdtp, struct e1000_hw *hw, @@ -1019,6 +1022,7 @@ struct e1000_hw_stats { uint64_t tsctfc; }; +#ifndef CONFIG_E1000_NO_NVM struct e1000_eeprom_info { e1000_eeprom_type type; uint16_t word_size; @@ -1029,6 +1033,7 @@ e1000_eeprom_type type; bool use_eerd; bool use_eewr; }; +#endif typedef enum { e1000_smart_speed_default = 0, @@ -1081,10 +1086,14 @@ struct e1000_hw { uint32_t io_base; #endif uint32_t asf_firmware_present; +#ifndef CONFIG_E1000_NO_NVM uint32_t eeprom_semaphore_present; +#endif uint32_t swfw_sync_present; uint32_t swfwhw_semaphore_present; +#ifndef CONFIG_E1000_NO_NVM struct e1000_eeprom_info eeprom; +#endif e1000_ms_type master_slave; e1000_ms_type original_master_slave; e1000_ffe_config ffe_config_state; |