aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2011-04-29 00:09:35 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2011-04-29 00:09:35 +0100
commitdbb6a54ba8c8d6e6673a3b86ea4c4aac78c808f0 (patch)
tree2f81ae7ba6894d5abf6c036eb88a514db8f758cf
parent398e365f47ff9cc624aab67b3decadefd27ff355 (diff)
parent6431c559a079e3b021881e4cb6d327a6aec7102f (diff)
downloadlinux-firmware-dbb6a54ba8c8d6e6673a3b86ea4c4aac78c808f0.tar.gz
Merge git://git.chelsio.net/pub/git/linux-firmware
-rw-r--r--LICENCE.chelsio_firmware27
-rw-r--r--WHENCE8
-rw-r--r--cxgb4/t4fw.binbin0 -> 231936 bytes
3 files changed, 35 insertions, 0 deletions
diff --git a/LICENCE.chelsio_firmware b/LICENCE.chelsio_firmware
new file mode 100644
index 00000000..0c5e1b4f
--- /dev/null
+++ b/LICENCE.chelsio_firmware
@@ -0,0 +1,27 @@
+Copyright (c) 2011 Chelsio Communications
+All rights reserved.
+
+Chelsio Communication Terminator 4 ethernet controller firmware
+
+Redistribution and use in binary form, without modification, are permitted provided
+that the following conditions are met:
+
+1. Redistribution in binary form must reproduce the above copyright notice, this
+ list of conditions and the following disclaimer in the documentation and/or
+ other materials provided with the distribution.
+2. The name of Chelsio Communications may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+3. Reverse engineering, decompilation, or disassembly of this firmware is not
+ permitted.
+
+DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/WHENCE b/WHENCE
index 0237ef1c..60c189c8 100644
--- a/WHENCE
+++ b/WHENCE
@@ -533,6 +533,14 @@ Found in hex form in kernel source.
--------------------------------------------------------------------------
+Driver: cxgb4 - Chelsio Terminator 4 1G/10G Ethernet adapter
+
+File: cxgb4/t4fw.bin
+
+Licence: Redistributable. See LICENCE.chelsio_firmware for details
+
+--------------------------------------------------------------------------
+
Driver: e100 -- Intel PRO/100 Ethernet NIC
File: e100/d101m_ucode.bin
diff --git a/cxgb4/t4fw.bin b/cxgb4/t4fw.bin
new file mode 100644
index 00000000..ad6ea278
--- /dev/null
+++ b/cxgb4/t4fw.bin
Binary files differ