diff options
Diffstat (limited to 'drivers/net/bnx2.h')
-rw-r--r-- | drivers/net/bnx2.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index c0e88f850493..4a2e6ba7cd70 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h | |||
@@ -3847,7 +3847,7 @@ struct sw_bd { | |||
3847 | #define BUFFERED_FLASH_PHY_PAGE_SIZE (1 << BUFFERED_FLASH_PAGE_BITS) | 3847 | #define BUFFERED_FLASH_PHY_PAGE_SIZE (1 << BUFFERED_FLASH_PAGE_BITS) |
3848 | #define BUFFERED_FLASH_BYTE_ADDR_MASK (BUFFERED_FLASH_PHY_PAGE_SIZE-1) | 3848 | #define BUFFERED_FLASH_BYTE_ADDR_MASK (BUFFERED_FLASH_PHY_PAGE_SIZE-1) |
3849 | #define BUFFERED_FLASH_PAGE_SIZE 264 | 3849 | #define BUFFERED_FLASH_PAGE_SIZE 264 |
3850 | #define BUFFERED_FLASH_TOTAL_SIZE 131072 | 3850 | #define BUFFERED_FLASH_TOTAL_SIZE 0x21000 |
3851 | 3851 | ||
3852 | #define SAIFUN_FLASH_PAGE_BITS 8 | 3852 | #define SAIFUN_FLASH_PAGE_BITS 8 |
3853 | #define SAIFUN_FLASH_PHY_PAGE_SIZE (1 << SAIFUN_FLASH_PAGE_BITS) | 3853 | #define SAIFUN_FLASH_PHY_PAGE_SIZE (1 << SAIFUN_FLASH_PAGE_BITS) |
@@ -3855,6 +3855,12 @@ struct sw_bd { | |||
3855 | #define SAIFUN_FLASH_PAGE_SIZE 256 | 3855 | #define SAIFUN_FLASH_PAGE_SIZE 256 |
3856 | #define SAIFUN_FLASH_BASE_TOTAL_SIZE 65536 | 3856 | #define SAIFUN_FLASH_BASE_TOTAL_SIZE 65536 |
3857 | 3857 | ||
3858 | #define ST_MICRO_FLASH_PAGE_BITS 8 | ||
3859 | #define ST_MICRO_FLASH_PHY_PAGE_SIZE (1 << ST_MICRO_FLASH_PAGE_BITS) | ||
3860 | #define ST_MICRO_FLASH_BYTE_ADDR_MASK (ST_MICRO_FLASH_PHY_PAGE_SIZE-1) | ||
3861 | #define ST_MICRO_FLASH_PAGE_SIZE 256 | ||
3862 | #define ST_MICRO_FLASH_BASE_TOTAL_SIZE 65536 | ||
3863 | |||
3858 | #define NVRAM_TIMEOUT_COUNT 30000 | 3864 | #define NVRAM_TIMEOUT_COUNT 30000 |
3859 | 3865 | ||
3860 | 3866 | ||
@@ -3863,6 +3869,8 @@ struct sw_bd { | |||
3863 | BNX2_NVM_CFG1_PROTECT_MODE | \ | 3869 | BNX2_NVM_CFG1_PROTECT_MODE | \ |
3864 | BNX2_NVM_CFG1_FLASH_SIZE) | 3870 | BNX2_NVM_CFG1_FLASH_SIZE) |
3865 | 3871 | ||
3872 | #define FLASH_BACKUP_STRAP_MASK (0xf << 26) | ||
3873 | |||
3866 | struct flash_spec { | 3874 | struct flash_spec { |
3867 | u32 strapping; | 3875 | u32 strapping; |
3868 | u32 config1; | 3876 | u32 config1; |