[kernel] r18938 - in dists/trunk/firmware-nonfree: . bnx2 bnx2/bnx2 bnx2x bnx2x/bnx2x debian

[Ben Hutchings]

Author: benh
Date: Mon Apr 16 05:44:52 2012
New Revision: 18938

Log:
Update Broadcom NetXtreme II firmware for use with Linux 3.3

Remove Broadcom NetXtreme II firmware not referenced by Linux 2.6.32, 3.2 or 3.3

Added:
   dists/trunk/firmware-nonfree/bnx2/bnx2/bnx2-mips-06-6.2.3.fw   (contents, props changed)
   dists/trunk/firmware-nonfree/bnx2/bnx2/bnx2-mips-09-6.2.1b.fw   (contents, props changed)
Deleted:
   dists/trunk/firmware-nonfree/bnx2/bnx2/bnx2-mips-09-6.2.1.fw
   dists/trunk/firmware-nonfree/bnx2x/bnx2x-e1-4.8.53.0.fw
   dists/trunk/firmware-nonfree/bnx2x/bnx2x-e1h-4.8.53.0.fw
   dists/trunk/firmware-nonfree/bnx2x/bnx2x/bnx2x-e1-7.0.23.0.fw
   dists/trunk/firmware-nonfree/bnx2x/bnx2x/bnx2x-e1h-7.0.23.0.fw
   dists/trunk/firmware-nonfree/bnx2x/bnx2x/bnx2x-e2-7.0.23.0.fw
Modified:
   dists/trunk/firmware-nonfree/bnx2/defines
   dists/trunk/firmware-nonfree/bnx2x/defines
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/defines

Added: dists/trunk/firmware-nonfree/bnx2/bnx2/bnx2-mips-06-6.2.3.fw
==============================================================================
Binary file. No diff available.

Added: dists/trunk/firmware-nonfree/bnx2/bnx2/bnx2-mips-09-6.2.1b.fw
==============================================================================
Binary file. No diff available.

Modified: dists/trunk/firmware-nonfree/bnx2/defines
==============================================================================
--- dists/trunk/firmware-nonfree/bnx2/defines	Mon Apr 16 05:22:54 2012	(r18937)
+++ dists/trunk/firmware-nonfree/bnx2/defines	Mon Apr 16 05:44:52 2012	(r18938)
@@ -10,8 +10,9 @@
  bnx2/bnx2-rv2p-09-6.0.17.fw
  bnx2/bnx2-rv2p-09ax-6.0.17.fw
  bnx2/bnx2-mips-06-6.2.1.fw
- bnx2/bnx2-mips-09-6.2.1.fw
+ bnx2/bnx2-mips-06-6.2.3.fw
  bnx2/bnx2-mips-09-6.2.1a.fw
+ bnx2/bnx2-mips-09-6.2.1b.fw
 
 longdesc: Broadcom NetXtremeII network adapters supported by the bnx2 driver
 support: initramfs-tools
@@ -53,10 +54,14 @@
 desc: Broadcom NetXtremeII 5706/5708 firmware (mips)
 version: Linux 2.6.38
 
-[bnx2/bnx2-mips-09-6.2.1.fw_base]
-desc: Broadcom NetXtremeII 5709/5716 firmware (mips)
-version: Linux 2.6.38
+[bnx2/bnx2-mips-06-6.2.3.fw_base]
+desc: Broadcom NetXtremeII 5706/5708 firmware (mips)
+version: Linux 3.3
 
 [bnx2/bnx2-mips-09-6.2.1a.fw_base]
 desc: Broadcom NetXtremeII 5709/5716 firmware (mips)
 version: Linux 2.6.39
+
+[bnx2/bnx2-mips-09-6.2.1b.fw_base]
+desc: Broadcom NetXtremeII 5709/5716 firmware (mips)
+version: Linux 3.3

Modified: dists/trunk/firmware-nonfree/bnx2x/defines
==============================================================================
--- dists/trunk/firmware-nonfree/bnx2x/defines	Mon Apr 16 05:22:54 2012	(r18937)
+++ dists/trunk/firmware-nonfree/bnx2x/defines	Mon Apr 16 05:44:52 2012	(r18938)
@@ -1,13 +1,8 @@
 [base]
 desc: Broadcom NetXtreme II 10Gb
 files:
- bnx2x-e1-4.8.53.0.fw
- bnx2x-e1h-4.8.53.0.fw
  bnx2x-e1-5.0.21.0.fw
  bnx2x-e1h-5.0.21.0.fw
- bnx2x/bnx2x-e1-7.0.23.0.fw
- bnx2x/bnx2x-e2-7.0.23.0.fw
- bnx2x/bnx2x-e1h-7.0.23.0.fw
  bnx2x/bnx2x-e1-7.0.29.0.fw
  bnx2x/bnx2x-e2-7.0.29.0.fw
  bnx2x/bnx2x-e1h-7.0.29.0.fw
@@ -16,14 +11,6 @@
 support: initramfs-tools
 uri: http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
 
-[bnx2x-e1-4.8.53.0.fw_base]
-desc: Broadcom NetXtreme II 10Gb 57710
-version: 4.8.53.0
-
-[bnx2x-e1h-4.8.53.0.fw_base]
-desc: Broadcom NetXtreme II 10Gb 57711
-version: 4.8.53.0
-
 [bnx2x-e1-5.0.21.0.fw_base]
 desc: Broadcom NetXtreme II 10Gb 57710
 version: 5.0.21.0
@@ -32,18 +19,6 @@
 desc: Broadcom NetXtreme II 10Gb 57711
 version: 5.0.21.0
 
-[bnx2x/bnx2x-e1-7.0.23.0.fw_base]
-desc: Broadcom NetXtreme II 10Gb 57710
-version: 7.0.23.0
-
-[bnx2x/bnx2x-e2-7.0.23.0.fw_base]
-desc: Broadcom NetXtreme II 10Gb 57711
-version: 7.0.23.0
-
-[bnx2x/bnx2x-e1h-7.0.23.0.fw_base]
-desc: Broadcom NetXtreme II 10Gb 57712
-version: 7.0.23.0
-
 [bnx2x/bnx2x-e1-7.0.29.0.fw_base]
 desc: Broadcom NetXtreme II 10Gb 57710
 version: 7.0.29.0

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	Mon Apr 16 05:22:54 2012	(r18937)
+++ dists/trunk/firmware-nonfree/debian/changelog	Mon Apr 16 05:44:52 2012	(r18938)
@@ -6,6 +6,9 @@
   * Add Chelsio T3 firmware version 7.10.0 (for Linux 2.6.36 onward)
   * Add Intel Wireless 105, 135, 2200, 2230 firmware
   * Update Intel Wireless 6030 firmware to version 18.168.6.1 (ABI 6)
+  * Update Broadcom NetXtreme II firmware for use with Linux 3.3
+  * Remove Broadcom NetXtreme II firmware not referenced by Linux 2.6.32,
+    3.2 or 3.3
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 11 Feb 2012 18:22:23 +0000
 

Modified: dists/trunk/firmware-nonfree/defines
==============================================================================
--- dists/trunk/firmware-nonfree/defines	Mon Apr 16 05:22:54 2012	(r18937)
+++ dists/trunk/firmware-nonfree/defines	Mon Apr 16 05:44:52 2012	(r18938)
@@ -27,10 +27,13 @@
  bnx2/bnx2-*-5.0.0.j6.fw
  bnx2/bnx2-*-5.0.0.j9.fw
  bnx2/bnx2-*-5.0.0.j10.fw
- bnx2/bnx2-mips-*-6.0.*.fw
+ bnx2/bnx2-mips-*-[56].0.*.fw
+ bnx2/bnx2-mips-09-6.2.1.fw
 # No Debian release references these versions
- bnx2x-e1*-5.2.7.0.fw
- bnx2x-e1*-5.2.13.0.fw
+ bnx2x-e1*-4.*.fw
+ bnx2x-e1*-5.2.*.fw
+ bnx2x/bnx2x-e*-6.*.fw
+ bnx2x/bnx2x-e*-7.0.2[03].0.fw
 # No Debian release references these versions
  cxgb3/t3fw-7.[01].0.bin
 # No Debian release references these versions