diff -Nru 14/drivers/net/bnx2.c 15/drivers/net/bnx2.c --- 14/drivers/net/bnx2.c 2005-05-23 13:01:45.000000000 -0700 +++ 15/drivers/net/bnx2.c 2005-05-23 13:31:05.000000000 -0700 @@ -264,7 +264,7 @@ synchronize_irq(bp->pdev->irq); } -void +static void bnx2_netif_stop(struct bnx2 *bp) { bnx2_disable_int_sync(bp); @@ -275,7 +275,7 @@ } } -void +static void bnx2_netif_start(struct bnx2 *bp) { if (atomic_dec_and_test(&bp->intr_sem)) { @@ -1807,8 +1807,8 @@ struct fw_info fw; /* Initialize the RV2P processor. */ - load_rv2p_fw(bp, rv2p_proc1, sizeof(rv2p_proc1), RV2P_PROC1); - load_rv2p_fw(bp, rv2p_proc2, sizeof(rv2p_proc2), RV2P_PROC2); + load_rv2p_fw(bp, bnx2_rv2p_proc1, sizeof(bnx2_rv2p_proc1), RV2P_PROC1); + load_rv2p_fw(bp, bnx2_rv2p_proc2, sizeof(bnx2_rv2p_proc2), RV2P_PROC2); /* Initialize the RX Processor. */ cpu_reg.mode = BNX2_RXP_CPU_MODE; @@ -1824,35 +1824,35 @@ cpu_reg.spad_base = BNX2_RXP_SCRATCH; cpu_reg.mips_view_base = 0x8000000; - fw.ver_major = RXP_b06FwReleaseMajor; - fw.ver_minor = RXP_b06FwReleaseMinor; - fw.ver_fix = RXP_b06FwReleaseFix; - fw.start_addr = RXP_b06FwStartAddr; + fw.ver_major = bnx2_RXP_b06FwReleaseMajor; + fw.ver_minor = bnx2_RXP_b06FwReleaseMinor; + fw.ver_fix = bnx2_RXP_b06FwReleaseFix; + fw.start_addr = bnx2_RXP_b06FwStartAddr; - fw.text_addr = RXP_b06FwTextAddr; - fw.text_len = RXP_b06FwTextLen; + fw.text_addr = bnx2_RXP_b06FwTextAddr; + fw.text_len = bnx2_RXP_b06FwTextLen; fw.text_index = 0; - fw.text = RXP_b06FwText; + fw.text = bnx2_RXP_b06FwText; - fw.data_addr = RXP_b06FwDataAddr; - fw.data_len = RXP_b06FwDataLen; + fw.data_addr = bnx2_RXP_b06FwDataAddr; + fw.data_len = bnx2_RXP_b06FwDataLen; fw.data_index = 0; - fw.data = RXP_b06FwData; + fw.data = bnx2_RXP_b06FwData; - fw.sbss_addr = RXP_b06FwSbssAddr; - fw.sbss_len = RXP_b06FwSbssLen; + fw.sbss_addr = bnx2_RXP_b06FwSbssAddr; + fw.sbss_len = bnx2_RXP_b06FwSbssLen; fw.sbss_index = 0; - fw.sbss = RXP_b06FwSbss; + fw.sbss = bnx2_RXP_b06FwSbss; - fw.bss_addr = RXP_b06FwBssAddr; - fw.bss_len = RXP_b06FwBssLen; + fw.bss_addr = bnx2_RXP_b06FwBssAddr; + fw.bss_len = bnx2_RXP_b06FwBssLen; fw.bss_index = 0; - fw.bss = RXP_b06FwBss; + fw.bss = bnx2_RXP_b06FwBss; - fw.rodata_addr = RXP_b06FwRodataAddr; - fw.rodata_len = RXP_b06FwRodataLen; + fw.rodata_addr = bnx2_RXP_b06FwRodataAddr; + fw.rodata_len = bnx2_RXP_b06FwRodataLen; fw.rodata_index = 0; - fw.rodata = RXP_b06FwRodata; + fw.rodata = bnx2_RXP_b06FwRodata; load_cpu_fw(bp, &cpu_reg, &fw); @@ -1870,35 +1870,35 @@ cpu_reg.spad_base = BNX2_TXP_SCRATCH; cpu_reg.mips_view_base = 0x8000000; - fw.ver_major = TXP_b06FwReleaseMajor; - fw.ver_minor = TXP_b06FwReleaseMinor; - fw.ver_fix = TXP_b06FwReleaseFix; - fw.start_addr = TXP_b06FwStartAddr; + fw.ver_major = bnx2_TXP_b06FwReleaseMajor; + fw.ver_minor = bnx2_TXP_b06FwReleaseMinor; + fw.ver_fix = bnx2_TXP_b06FwReleaseFix; + fw.start_addr = bnx2_TXP_b06FwStartAddr; - fw.text_addr = TXP_b06FwTextAddr; - fw.text_len = TXP_b06FwTextLen; + fw.text_addr = bnx2_TXP_b06FwTextAddr; + fw.text_len = bnx2_TXP_b06FwTextLen; fw.text_index = 0; - fw.text = TXP_b06FwText; + fw.text = bnx2_TXP_b06FwText; - fw.data_addr = TXP_b06FwDataAddr; - fw.data_len = TXP_b06FwDataLen; + fw.data_addr = bnx2_TXP_b06FwDataAddr; + fw.data_len = bnx2_TXP_b06FwDataLen; fw.data_index = 0; - fw.data = TXP_b06FwData; + fw.data = bnx2_TXP_b06FwData; - fw.sbss_addr = TXP_b06FwSbssAddr; - fw.sbss_len = TXP_b06FwSbssLen; + fw.sbss_addr = bnx2_TXP_b06FwSbssAddr; + fw.sbss_len = bnx2_TXP_b06FwSbssLen; fw.sbss_index = 0; - fw.sbss = TXP_b06FwSbss; + fw.sbss = bnx2_TXP_b06FwSbss; - fw.bss_addr = TXP_b06FwBssAddr; - fw.bss_len = TXP_b06FwBssLen; + fw.bss_addr = bnx2_TXP_b06FwBssAddr; + fw.bss_len = bnx2_TXP_b06FwBssLen; fw.bss_index = 0; - fw.bss = TXP_b06FwBss; + fw.bss = bnx2_TXP_b06FwBss; - fw.rodata_addr = TXP_b06FwRodataAddr; - fw.rodata_len = TXP_b06FwRodataLen; + fw.rodata_addr = bnx2_TXP_b06FwRodataAddr; + fw.rodata_len = bnx2_TXP_b06FwRodataLen; fw.rodata_index = 0; - fw.rodata = TXP_b06FwRodata; + fw.rodata = bnx2_TXP_b06FwRodata; load_cpu_fw(bp, &cpu_reg, &fw); @@ -1916,35 +1916,35 @@ cpu_reg.spad_base = BNX2_TPAT_SCRATCH; cpu_reg.mips_view_base = 0x8000000; - fw.ver_major = TPAT_b06FwReleaseMajor; - fw.ver_minor = TPAT_b06FwReleaseMinor; - fw.ver_fix = TPAT_b06FwReleaseFix; - fw.start_addr = TPAT_b06FwStartAddr; + fw.ver_major = bnx2_TPAT_b06FwReleaseMajor; + fw.ver_minor = bnx2_TPAT_b06FwReleaseMinor; + fw.ver_fix = bnx2_TPAT_b06FwReleaseFix; + fw.start_addr = bnx2_TPAT_b06FwStartAddr; - fw.text_addr = TPAT_b06FwTextAddr; - fw.text_len = TPAT_b06FwTextLen; + fw.text_addr = bnx2_TPAT_b06FwTextAddr; + fw.text_len = bnx2_TPAT_b06FwTextLen; fw.text_index = 0; - fw.text = TPAT_b06FwText; + fw.text = bnx2_TPAT_b06FwText; - fw.data_addr = TPAT_b06FwDataAddr; - fw.data_len = TPAT_b06FwDataLen; + fw.data_addr = bnx2_TPAT_b06FwDataAddr; + fw.data_len = bnx2_TPAT_b06FwDataLen; fw.data_index = 0; - fw.data = TPAT_b06FwData; + fw.data = bnx2_TPAT_b06FwData; - fw.sbss_addr = TPAT_b06FwSbssAddr; - fw.sbss_len = TPAT_b06FwSbssLen; + fw.sbss_addr = bnx2_TPAT_b06FwSbssAddr; + fw.sbss_len = bnx2_TPAT_b06FwSbssLen; fw.sbss_index = 0; - fw.sbss = TPAT_b06FwSbss; + fw.sbss = bnx2_TPAT_b06FwSbss; - fw.bss_addr = TPAT_b06FwBssAddr; - fw.bss_len = TPAT_b06FwBssLen; + fw.bss_addr = bnx2_TPAT_b06FwBssAddr; + fw.bss_len = bnx2_TPAT_b06FwBssLen; fw.bss_index = 0; - fw.bss = TPAT_b06FwBss; + fw.bss = bnx2_TPAT_b06FwBss; - fw.rodata_addr = TPAT_b06FwRodataAddr; - fw.rodata_len = TPAT_b06FwRodataLen; + fw.rodata_addr = bnx2_TPAT_b06FwRodataAddr; + fw.rodata_len = bnx2_TPAT_b06FwRodataLen; fw.rodata_index = 0; - fw.rodata = TPAT_b06FwRodata; + fw.rodata = bnx2_TPAT_b06FwRodata; load_cpu_fw(bp, &cpu_reg, &fw); @@ -1962,35 +1962,35 @@ cpu_reg.spad_base = BNX2_COM_SCRATCH; cpu_reg.mips_view_base = 0x8000000; - fw.ver_major = COM_b06FwReleaseMajor; - fw.ver_minor = COM_b06FwReleaseMinor; - fw.ver_fix = COM_b06FwReleaseFix; - fw.start_addr = COM_b06FwStartAddr; + fw.ver_major = bnx2_COM_b06FwReleaseMajor; + fw.ver_minor = bnx2_COM_b06FwReleaseMinor; + fw.ver_fix = bnx2_COM_b06FwReleaseFix; + fw.start_addr = bnx2_COM_b06FwStartAddr; - fw.text_addr = COM_b06FwTextAddr; - fw.text_len = COM_b06FwTextLen; + fw.text_addr = bnx2_COM_b06FwTextAddr; + fw.text_len = bnx2_COM_b06FwTextLen; fw.text_index = 0; - fw.text = COM_b06FwText; + fw.text = bnx2_COM_b06FwText; - fw.data_addr = COM_b06FwDataAddr; - fw.data_len = COM_b06FwDataLen; + fw.data_addr = bnx2_COM_b06FwDataAddr; + fw.data_len = bnx2_COM_b06FwDataLen; fw.data_index = 0; - fw.data = COM_b06FwData; + fw.data = bnx2_COM_b06FwData; - fw.sbss_addr = COM_b06FwSbssAddr; - fw.sbss_len = COM_b06FwSbssLen; + fw.sbss_addr = bnx2_COM_b06FwSbssAddr; + fw.sbss_len = bnx2_COM_b06FwSbssLen; fw.sbss_index = 0; - fw.sbss = COM_b06FwSbss; + fw.sbss = bnx2_COM_b06FwSbss; - fw.bss_addr = COM_b06FwBssAddr; - fw.bss_len = COM_b06FwBssLen; + fw.bss_addr = bnx2_COM_b06FwBssAddr; + fw.bss_len = bnx2_COM_b06FwBssLen; fw.bss_index = 0; - fw.bss = COM_b06FwBss; + fw.bss = bnx2_COM_b06FwBss; - fw.rodata_addr = COM_b06FwRodataAddr; - fw.rodata_len = COM_b06FwRodataLen; + fw.rodata_addr = bnx2_COM_b06FwRodataAddr; + fw.rodata_len = bnx2_COM_b06FwRodataLen; fw.rodata_index = 0; - fw.rodata = COM_b06FwRodata; + fw.rodata = bnx2_COM_b06FwRodata; load_cpu_fw(bp, &cpu_reg, &fw); @@ -4695,11 +4695,11 @@ return 0; } -#define ETH_NUM_STATS 45 +#define BNX2_NUM_STATS 45 struct { char string[ETH_GSTRING_LEN]; -} bnx2_stats_str_arr[ETH_NUM_STATS] = { +} bnx2_stats_str_arr[BNX2_NUM_STATS] = { { "rx_bytes" }, { "rx_error_bytes" }, { "tx_bytes" }, @@ -4749,7 +4749,7 @@ #define STATS_OFFSET32(offset_name) (offsetof(struct statistics_block, offset_name) / 4) -unsigned long bnx2_stats_offset_arr[ETH_NUM_STATS] = { +unsigned long bnx2_stats_offset_arr[BNX2_NUM_STATS] = { STATS_OFFSET32(stat_IfHCInOctets_hi), STATS_OFFSET32(stat_IfHCInBadOctets_hi), STATS_OFFSET32(stat_IfHCOutOctets_hi), @@ -4800,7 +4800,7 @@ /* stat_IfHCInBadOctets and stat_Dot3StatsCarrierSenseErrors are * skipped because of errata. */ -u8 bnx2_5706_stats_len_arr[ETH_NUM_STATS] = { +u8 bnx2_5706_stats_len_arr[BNX2_NUM_STATS] = { 8,0,8,8,8,8,8,8,8,8, 4,0,4,4,4,4,4,4,4,4, 4,4,4,4,4,4,4,4,4,4, @@ -4808,11 +4808,11 @@ 4,4,4,4,4, }; -#define ETH_NUM_TESTS 6 +#define BNX2_NUM_TESTS 6 struct { char string[ETH_GSTRING_LEN]; -} bnx2_tests_str_arr[ETH_NUM_TESTS] = { +} bnx2_tests_str_arr[BNX2_NUM_TESTS] = { { "register_test (offline)" }, { "memory_test (offline)" }, { "loopback_test (offline)" }, @@ -4824,7 +4824,7 @@ static int bnx2_self_test_count(struct net_device *dev) { - return ETH_NUM_TESTS; + return BNX2_NUM_TESTS; } static void @@ -4832,7 +4832,7 @@ { struct bnx2 *bp = dev->priv; - memset(buf, 0, sizeof(u64) * ETH_NUM_TESTS); + memset(buf, 0, sizeof(u64) * BNX2_NUM_TESTS); if (etest->flags & ETH_TEST_FL_OFFLINE) { bnx2_netif_stop(bp); bnx2_reset_chip(bp, BNX2_DRV_MSG_CODE_DIAG); @@ -4899,7 +4899,7 @@ static int bnx2_get_stats_count(struct net_device *dev) { - return ETH_NUM_STATS; + return BNX2_NUM_STATS; } static void @@ -4912,14 +4912,14 @@ u8 *stats_len_arr = 0; if (hw_stats == NULL) { - memset(buf, 0, sizeof(u64) * ETH_NUM_STATS); + memset(buf, 0, sizeof(u64) * BNX2_NUM_STATS); return; } if (CHIP_NUM(bp) == CHIP_NUM_5706) stats_len_arr = bnx2_5706_stats_len_arr; - for (i = 0; i < ETH_NUM_STATS; i++) { + for (i = 0; i < BNX2_NUM_STATS; i++) { if (stats_len_arr[i] == 0) { /* skip this counter */ buf[i] = 0; diff -Nru 14/drivers/net/bnx2_fw.h 15/drivers/net/bnx2_fw.h --- 14/drivers/net/bnx2_fw.h 2005-05-23 13:33:28.000000000 -0700 +++ 15/drivers/net/bnx2_fw.h 2005-05-23 13:31:10.000000000 -0700 @@ -15,21 +15,21 @@ */ -int COM_b06FwReleaseMajor = 0x0; -int COM_b06FwReleaseMinor = 0x0; -int COM_b06FwReleaseFix = 0x0; -u32 COM_b06FwStartAddr = 0x080004a0; -u32 COM_b06FwTextAddr = 0x08000000; -int COM_b06FwTextLen = 0x4594; -u32 COM_b06FwDataAddr = 0x080045e0; -int COM_b06FwDataLen = 0x0; -u32 COM_b06FwRodataAddr = 0x08004598; -int COM_b06FwRodataLen = 0x18; -u32 COM_b06FwBssAddr = 0x08004600; -int COM_b06FwBssLen = 0x88; -u32 COM_b06FwSbssAddr = 0x080045e0; -int COM_b06FwSbssLen = 0x1c; -u32 COM_b06FwText[(0x4594/4) + 1] = { +static int bnx2_COM_b06FwReleaseMajor = 0x0; +static int bnx2_COM_b06FwReleaseMinor = 0x0; +static int bnx2_COM_b06FwReleaseFix = 0x0; +static u32 bnx2_COM_b06FwStartAddr = 0x080004a0; +static u32 bnx2_COM_b06FwTextAddr = 0x08000000; +static int bnx2_COM_b06FwTextLen = 0x4594; +static u32 bnx2_COM_b06FwDataAddr = 0x080045e0; +static int bnx2_COM_b06FwDataLen = 0x0; +static u32 bnx2_COM_b06FwRodataAddr = 0x08004598; +static int bnx2_COM_b06FwRodataLen = 0x18; +static u32 bnx2_COM_b06FwBssAddr = 0x08004600; +static int bnx2_COM_b06FwBssLen = 0x88; +static u32 bnx2_COM_b06FwSbssAddr = 0x080045e0; +static int bnx2_COM_b06FwSbssLen = 0x1c; +static u32 bnx2_COM_b06FwText[(0x4594/4) + 1] = { 0x0a000128, 0x00000000, 0x00000000, 0x0000000d, 0x636f6d20, 0x302e362e, 0x39000000, 0x00060902, 0x00000000, 0x00000003, 0x00000014, 0x00000032, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, @@ -774,30 +774,30 @@ 0x8f420000, 0x30420020, 0x1040fffd, 0x3c020020, 0xaf420030, 0x03e00008, 0x00000000, 0x00000000 }; -u32 COM_b06FwData[(0x0/4) + 1] = { 0x00000000 }; -u32 COM_b06FwRodata[(0x18/4) + 1] = { +static u32 bnx2_COM_b06FwData[(0x0/4) + 1] = { 0x00000000 }; +static u32 bnx2_COM_b06FwRodata[(0x18/4) + 1] = { 0x08002318, 0x08002348, 0x08002378, 0x080023a8, 0x080023d8, 0x00000000, 0x00000000 }; -u32 COM_b06FwBss[(0x88/4) + 1] = { 0x00000000 }; -u32 COM_b06FwSbss[(0x1c/4) + 1] = { 0x00000000 }; +static u32 bnx2_COM_b06FwBss[(0x88/4) + 1] = { 0x00000000 }; +static u32 bnx2_COM_b06FwSbss[(0x1c/4) + 1] = { 0x00000000 }; -int RXP_b06FwReleaseMajor = 0x0; -int RXP_b06FwReleaseMinor = 0x0; -int RXP_b06FwReleaseFix = 0x0; -u32 RXP_b06FwStartAddr = 0x08000060; -u32 RXP_b06FwTextAddr = 0x08000000; -int RXP_b06FwTextLen = 0x20b8; -u32 RXP_b06FwDataAddr = 0x080020e0; -int RXP_b06FwDataLen = 0x0; -u32 RXP_b06FwRodataAddr = 0x00000000; -int RXP_b06FwRodataLen = 0x0; -u32 RXP_b06FwBssAddr = 0x08002100; -int RXP_b06FwBssLen = 0x239c; -u32 RXP_b06FwSbssAddr = 0x080020e0; -int RXP_b06FwSbssLen = 0x14; +static int bnx2_RXP_b06FwReleaseMajor = 0x0; +static int bnx2_RXP_b06FwReleaseMinor = 0x0; +static int bnx2_RXP_b06FwReleaseFix = 0x0; +static u32 bnx2_RXP_b06FwStartAddr = 0x08000060; +static u32 bnx2_RXP_b06FwTextAddr = 0x08000000; +static int bnx2_RXP_b06FwTextLen = 0x20b8; +static u32 bnx2_RXP_b06FwDataAddr = 0x080020e0; +static int bnx2_RXP_b06FwDataLen = 0x0; +static u32 bnx2_RXP_b06FwRodataAddr = 0x00000000; +static int bnx2_RXP_b06FwRodataLen = 0x0; +static u32 bnx2_RXP_b06FwBssAddr = 0x08002100; +static int bnx2_RXP_b06FwBssLen = 0x239c; +static u32 bnx2_RXP_b06FwSbssAddr = 0x080020e0; +static int bnx2_RXP_b06FwSbssLen = 0x14; -u32 RXP_b06FwText[(0x20b8/4) + 1] = { +static u32 bnx2_RXP_b06FwText[(0x20b8/4) + 1] = { 0x0a000018, 0x00000000, 0x00000000, 0x0000000d, 0x72787020, 0x302e362e, 0x39000000, 0x00060903, 0x00000000, 0x0000000d, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, @@ -1149,12 +1149,12 @@ 0x24840004, 0x00a01021, 0x1440fffc, 0x24a5ffff, 0x03e00008, 0x00000000, 0x00000000 }; -u32 RXP_b06FwData[(0x0/4) + 1] = { 0x00000000 }; -u32 RXP_b06FwRodata[(0x0/4) + 1] = { 0x00000000 }; -u32 RXP_b06FwBss[(0x239c/4) + 1] = { 0x00000000 }; -u32 RXP_b06FwSbss[(0x14/4) + 1] = { 0x00000000 }; +static u32 bnx2_RXP_b06FwData[(0x0/4) + 1] = { 0x00000000 }; +static u32 bnx2_RXP_b06FwRodata[(0x0/4) + 1] = { 0x00000000 }; +static u32 bnx2_RXP_b06FwBss[(0x239c/4) + 1] = { 0x00000000 }; +static u32 bnx2_RXP_b06FwSbss[(0x14/4) + 1] = { 0x00000000 }; -u32 rv2p_proc1[] = { +static u32 bnx2_rv2p_proc1[] = { 0x00000008, 0xac000001, 0x0000000c, 0x2f800001, 0x00000010, 0x213f0004, 0x00000010, 0x20bf002c, 0x00000010, 0x203f0143, 0x00000018, 0x8000fffd, 0x00000010, 0xb1b8b017, 0x0000000b, 0x2fdf0002, 0x00000000, 0x03d80000, @@ -1279,7 +1279,7 @@ 0x00000001, 0x860c0e00, 0x00000008, 0x02040004, 0x00000000, 0x02041800, 0x00000000, 0x83871800, 0x00000018, 0x00020000 }; -u32 rv2p_proc2[] = { +static u32 bnx2_rv2p_proc2[] = { 0x00000000, 0x2a000000, 0x00000010, 0xb1d40000, 0x00000008, 0x02540003, 0x00000018, 0x00040000, 0x00000018, 0x8000000a, 0x00000018, 0x8000000a, 0x00000018, 0x8000000e, 0x00000018, 0x80000056, 0x00000018, 0x800001b9, @@ -1536,22 +1536,22 @@ 0x0000000c, 0x29520000, 0x00000018, 0x80000002, 0x0000000c, 0x29800000, 0x00000018, 0x00570000 }; -int TPAT_b06FwReleaseMajor = 0x0; -int TPAT_b06FwReleaseMinor = 0x0; -int TPAT_b06FwReleaseFix = 0x0; -u32 TPAT_b06FwStartAddr = 0x08000858; -u32 TPAT_b06FwTextAddr = 0x08000800; -int TPAT_b06FwTextLen = 0x1314; -u32 TPAT_b06FwDataAddr = 0x08001b40; -int TPAT_b06FwDataLen = 0x0; -u32 TPAT_b06FwRodataAddr = 0x00000000; -int TPAT_b06FwRodataLen = 0x0; -u32 TPAT_b06FwBssAddr = 0x08001b90; -int TPAT_b06FwBssLen = 0x80; -u32 TPAT_b06FwSbssAddr = 0x08001b40; -int TPAT_b06FwSbssLen = 0x48; +static int bnx2_TPAT_b06FwReleaseMajor = 0x0; +static int bnx2_TPAT_b06FwReleaseMinor = 0x0; +static int bnx2_TPAT_b06FwReleaseFix = 0x0; +static u32 bnx2_TPAT_b06FwStartAddr = 0x08000858; +static u32 bnx2_TPAT_b06FwTextAddr = 0x08000800; +static int bnx2_TPAT_b06FwTextLen = 0x1314; +static u32 bnx2_TPAT_b06FwDataAddr = 0x08001b40; +static int bnx2_TPAT_b06FwDataLen = 0x0; +static u32 bnx2_TPAT_b06FwRodataAddr = 0x00000000; +static int bnx2_TPAT_b06FwRodataLen = 0x0; +static u32 bnx2_TPAT_b06FwBssAddr = 0x08001b90; +static int bnx2_TPAT_b06FwBssLen = 0x80; +static u32 bnx2_TPAT_b06FwSbssAddr = 0x08001b40; +static int bnx2_TPAT_b06FwSbssLen = 0x48; -u32 TPAT_b06FwText[(0x1314/4) + 1] = { +static u32 bnx2_TPAT_b06FwText[(0x1314/4) + 1] = { 0x0a000216, 0x00000000, 0x00000000, 0x0000000d, 0x74706174, 0x20302e36, 0x2e390000, 0x00060901, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, @@ -1757,26 +1757,26 @@ 0x3c056000, 0x24030019, 0xaca223f8, 0xa743014a, 0x8ca44448, 0x3c020800, 0xac440854, 0x03e00008, 0x00000000, 0x00000000 }; -u32 TPAT_b06FwData[(0x0/4) + 1] = { 0x00000000 }; -u32 TPAT_b06FwRodata[(0x0/4) + 1] = { 0x00000000 }; -u32 TPAT_b06FwBss[(0x80/4) + 1] = { 0x00000000 }; -u32 TPAT_b06FwSbss[(0x48/4) + 1] = { 0x00000000 }; +static u32 bnx2_TPAT_b06FwData[(0x0/4) + 1] = { 0x00000000 }; +static u32 bnx2_TPAT_b06FwRodata[(0x0/4) + 1] = { 0x00000000 }; +static u32 bnx2_TPAT_b06FwBss[(0x80/4) + 1] = { 0x00000000 }; +static u32 bnx2_TPAT_b06FwSbss[(0x48/4) + 1] = { 0x00000000 }; -int TXP_b06FwReleaseMajor = 0x0; -int TXP_b06FwReleaseMinor = 0x0; -int TXP_b06FwReleaseFix = 0x0; -u32 TXP_b06FwStartAddr = 0x08002090; -u32 TXP_b06FwTextAddr = 0x08000000; -int TXP_b06FwTextLen = 0x3ffc; -u32 TXP_b06FwDataAddr = 0x08004020; -int TXP_b06FwDataLen = 0x0; -u32 TXP_b06FwRodataAddr = 0x00000000; -int TXP_b06FwRodataLen = 0x0; -u32 TXP_b06FwBssAddr = 0x08004060; -int TXP_b06FwBssLen = 0x194; -u32 TXP_b06FwSbssAddr = 0x08004020; -int TXP_b06FwSbssLen = 0x34; -u32 TXP_b06FwText[(0x3ffc/4) + 1] = { +static int bnx2_TXP_b06FwReleaseMajor = 0x0; +static int bnx2_TXP_b06FwReleaseMinor = 0x0; +static int bnx2_TXP_b06FwReleaseFix = 0x0; +static u32 bnx2_TXP_b06FwStartAddr = 0x08002090; +static u32 bnx2_TXP_b06FwTextAddr = 0x08000000; +static int bnx2_TXP_b06FwTextLen = 0x3ffc; +static u32 bnx2_TXP_b06FwDataAddr = 0x08004020; +static int bnx2_TXP_b06FwDataLen = 0x0; +static u32 bnx2_TXP_b06FwRodataAddr = 0x00000000; +static int bnx2_TXP_b06FwRodataLen = 0x0; +static u32 bnx2_TXP_b06FwBssAddr = 0x08004060; +static int bnx2_TXP_b06FwBssLen = 0x194; +static u32 bnx2_TXP_b06FwSbssAddr = 0x08004020; +static int bnx2_TXP_b06FwSbssLen = 0x34; +static u32 bnx2_TXP_b06FwText[(0x3ffc/4) + 1] = { 0x0a000824, 0x00000000, 0x00000000, 0x0000000d, 0x74787020, 0x302e362e, 0x39000000, 0x00060900, 0x0000000a, 0x000003e8, 0x0000ea60, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, @@ -2461,8 +2461,8 @@ 0x8c820064, 0x254a0001, 0x314a007f, 0x01094021, 0xad6a0060, 0x24420001, 0xac820064, 0x03e00008, 0xad05001c, 0x00000000 }; -u32 TXP_b06FwData[(0x0/4) + 1] = { 0x00000000 }; -u32 TXP_b06FwRodata[(0x0/4) + 1] = { 0x00000000 }; -u32 TXP_b06FwBss[(0x194/4) + 1] = { 0x00000000 }; -u32 TXP_b06FwSbss[(0x34/4) + 1] = { 0x00000000 }; +static u32 bnx2_TXP_b06FwData[(0x0/4) + 1] = { 0x00000000 }; +static u32 bnx2_TXP_b06FwRodata[(0x0/4) + 1] = { 0x00000000 }; +static u32 bnx2_TXP_b06FwBss[(0x194/4) + 1] = { 0x00000000 }; +static u32 bnx2_TXP_b06FwSbss[(0x34/4) + 1] = { 0x00000000 };