[firmware-nonfree] 22/24: qlogic: Include firmware for former Brocade adapters supported by bfa and bna

Sun Oct 18 13:49:59 UTC 2015

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository firmware-nonfree.

commit ef3ab803c76c508b2e1d4a5a6d1150cdb598fdf8
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Oct 18 06:49:51 2015 +0100

    qlogic: Include firmware for former Brocade adapters supported by bfa and bna
    
    Explicitly exclude the oldest version, which isn't referenced by any
    release.
---
 debian/TODO                    |  6 ------
 debian/changelog               |  3 +++
 debian/config/defines          |  4 ++++
 debian/config/qlogic/copyright | 16 ++++++++++++++++
 debian/config/qlogic/defines   | 38 ++++++++++++++++++++++++++++++++++----
 5 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/debian/TODO b/debian/TODO
index aa98042..f1b84b3 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -10,9 +10,6 @@ go7007/go7007tv.bin
 go7007/go7007fw.bin
 go7007/px-m402u.fw
 go7007/wis-startrek.fw
-ct2fw-3.2.3.0.bin
-ctfw-3.2.3.0.bin
-cbfw-3.2.3.0.bin
 intel/fw_sst_0f28.bin-48kHz_i2s_master
 as102_data1_st.hex
 as102_data2_st.hex
@@ -24,8 +21,5 @@ or 3.18:
 
 ctspeq.bin
 mt7650.bin
-ctfw-3.2.1.1.bin
-ct2fw-3.2.1.1.bin
-cbfw-3.2.1.1.bin
 qat_895xcc.bin
 r8a779x_usb3_v1.dlmem
diff --git a/debian/changelog b/debian/changelog
index 4e2f8f1..52f40d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,9 @@ firmware-nonfree (20151018-1) UNRELEASED; urgency=medium
   * brcm80211: Include firmware for many more chips supported by the
     brcmfmac driver
   * qlogic: Convert copyright file to structured format
+  * qlogic: Include firmware for QLogic (formerly Brocade) Fibre Channel
+    adapters and Converged Network Adapters supported by the bfa and bna
+    drivers
 
   [ maximilian attems ]
   * iwlwifi: Update Intel Wireless 3160, 7260, 7265 and 7265D firmware version
diff --git a/debian/config/defines b/debian/config/defines
index 5a25202..abaf498 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -93,6 +93,10 @@ exclude:
  bnx2x/bnx2x-e*-7.8.2.0.fw
 # No Debian release references these versions
  cxgb3/t3fw-7.[01].0.bin
+# No Debian release references this version
+ cbfw-3.2.1.1.bin
+ ct2fw-3.2.1.1.bin
+ ctfw-3.2.1.1.bin
 # No Debian release requires these versions
  iwlwifi-1000-3.ucode
  iwlwifi-3945-1.ucode
diff --git a/debian/config/qlogic/copyright b/debian/config/qlogic/copyright
index 5750a7c..556f912 100644
--- a/debian/config/qlogic/copyright
+++ b/debian/config/qlogic/copyright
@@ -89,3 +89,19 @@ License: Binary redistribution (QLogic 2)
  TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN
  ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN
  COMBINATION WITH THIS PROGRAM.
+
+Files: cbfw-*.bin, ct2fw-*.bin, ctfw-*.bin
+Copyright: 2013-2014, Brocade Communications Systems, Inc.
+ 2014-2015, QLogic Corporation.
+License: Binary redistribution (QLogic BR-series)
+ Permission is hereby granted for the distribution of this firmware data
+ in hexadecimal or equivalent format, provided this copyright notice is
+ accompanying it.
+ .
+ QLogic grants permission to use and redistribute these firmware files
+ for use with QLogic BR-series devices, but not as a part of the Linux
+ kernel or in any other form which would require these files themselves
+ to be covered by the terms of the GNU General Public License.
+ These firmware files are distributed in the hope that they will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/debian/config/qlogic/defines b/debian/config/qlogic/defines
index 2b9858a..b02bae8 100644
--- a/debian/config/qlogic/defines
+++ b/debian/config/qlogic/defines
@@ -1,6 +1,12 @@
 [base]
-desc: QLogic IBA7220, QLA1xxx, ISP2xxx and SP2x2
+desc: QLogic HBAs
 files:
+ cbfw-3.2.3.0.bin
+ cbfw-3.2.5.1.bin
+ ct2fw-3.2.3.0.bin
+ ct2fw-3.2.5.1.bin
+ ctfw-3.2.3.0.bin
+ ctfw-3.2.5.1.bin
  qlogic/1040.bin
  qlogic/1280.bin
  qlogic/12160.bin
@@ -11,11 +17,35 @@ files:
  ql2322_fw.bin
  ql2400_fw.bin
  ql2500_fw.bin
-longdesc: QLogic IBA7220 (Infiniband), QLA1xxx (SCSI), ISP2xxx- and
- SP2x2-based (Fibre Channel/FCoE) host adapters supported by the ip_iband,
- qla1280 and qla2xxx drivers
+longdesc: QLogic Infiniband, SCSI, Fibre Channel/FCoE adapters and
+ Converged Network Adapters supported by the bfa, bna, ip_iband, qla1280 and
+ qla2xxx drivers
 support: initramfs-tools
 
+[cbfw-3.2.3.0.bin_base]
+desc: Brocade 425/825/42B/82B/415/815/41B/81B firmware
+version: 3.2.3.0
+
+[cbfw-3.2.5.1.bin_base]
+desc: Brocade 425/825/42B/82B/415/815/41B/81B firmware
+version: 3.2.5.1
+
+[ct2fw-3.2.3.0.bin_base]
+desc: Brocade 1860/1867/1869 firmware
+version: 3.2.3.0
+
+[ct2fw-3.2.5.1.bin_base]
+desc: Brocade 1860/1867/1869 firmware
+version: 3.2.5.1
+
+[ctfw-3.2.3.0.bin_base]
+desc: Brocade 1010/1020/1007/1741/804 firmware
+version: 3.2.3.0
+
+[ctfw-3.2.5.1.bin_base]
+desc: Brocade 1010/1020/1007/1741/804 firmware
+version: 3.2.5.1
+
 [qlogic/1040.bin_base]
 desc: QLogic QLA1040 firmware
 version: 7.65.06

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/firmware-nonfree.git

