diff options
| author | Timur Tabi <timur@freescale.com> | 2011-11-01 06:20:55 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-17 10:00:10 +0100 |
| commit | a22481febed5cf6bb1b8f0afb86c1772a153229a (patch) | |
| tree | 95ee29a160d60ae780d999a61bcb670c4782c5cd /drivers | |
| parent | 6005ed55a91fa2695d46f1d031cb97696b65294b (diff) | |
| download | u-boot-imx-a22481febed5cf6bb1b8f0afb86c1772a153229a.zip u-boot-imx-a22481febed5cf6bb1b8f0afb86c1772a153229a.tar.gz u-boot-imx-a22481febed5cf6bb1b8f0afb86c1772a153229a.tar.bz2 | |
e1000: remove duplicate macros in e1000.h
Some of the EEPROM Word Offset macros, and a few others, are defined
twice in e1000.h.
Signed-off-by: Timur Tabi <timur@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/e1000.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h index d8400d4..fd1d8f8 100644 --- a/drivers/net/e1000.h +++ b/drivers/net/e1000.h @@ -1678,14 +1678,6 @@ struct e1000_hw { #define EEPROM_EWEN_OPCODE 0x13 /* EERPOM erase/write enable */ #define EEPROM_EWDS_OPCODE 0x10 /* EERPOM erast/write disable */ -/* EEPROM Word Offsets */ -#define EEPROM_COMPAT 0x0003 -#define EEPROM_ID_LED_SETTINGS 0x0004 -#define EEPROM_INIT_CONTROL1_REG 0x000A -#define EEPROM_INIT_CONTROL2_REG 0x000F -#define EEPROM_FLASH_VERSION 0x0032 -#define EEPROM_CHECKSUM_REG 0x003F - /* Word definitions for ID LED Settings */ #define ID_LED_RESERVED_0000 0x0000 #define ID_LED_RESERVED_FFFF 0xFFFF @@ -2479,7 +2471,6 @@ struct e1000_hw { #define ADVERTISE_100_FULL 0x0008 #define ADVERTISE_1000_HALF 0x0010 #define ADVERTISE_1000_FULL 0x0020 -#define AUTONEG_ADVERTISE_SPEED_DEFAULT 0x002F /* Everything but 1000-Half */ #define ICH_FLASH_GFPREG 0x0000 #define ICH_FLASH_HSFSTS 0x0004 @@ -2504,7 +2495,6 @@ struct e1000_hw { #define ICH_GFPREG_BASE_MASK 0x1FFF #define ICH_FLASH_LINEAR_ADDR_MASK 0x00FFFFFF -#define E1000_EEWR 0x0102C /* EEPROM Write Register - RW */ #define E1000_SW_FW_SYNC 0x05B5C /* Software-Firmware Synchronization - RW */ /* SPI EEPROM Status Register */ @@ -2599,7 +2589,6 @@ struct e1000_hw { #define PHY_CFG_TIMEOUT 100 #define DEFAULT_80003ES2LAN_TIPG_IPGT_10_100 0x00000009 #define DEFAULT_80003ES2LAN_TIPG_IPGT_1000 0x00000008 -#define E1000_TXDMAC_DPP 0x00000001 #define AUTO_ALL_MODES 0 #ifndef E1000_MASTER_SLAVE |