From: David Woodhouse Date: Sun, 19 Apr 2009 19:37:33 +0000 (+0100) Subject: Merge branch 'from-kernel' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2... X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a9cf53b3ae80c3ba09dbe95233e5601f6340c1f;hp=-c;p=linux-firmware Merge branch 'from-kernel' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware Conflicts: WHENCE --- 3a9cf53b3ae80c3ba09dbe95233e5601f6340c1f diff --combined WHENCE index f519b83,10f61c9..a57bab5 --- a/WHENCE +++ b/WHENCE @@@ -8,6 -8,24 +8,24 @@@ kernel -------------------------------------------------------------------------- + Driver: ambassador -- Madge Ambassador (Collage PCI 155 Server) ATM NIC. + + File: firmware/atmsar11.fw + + Licence: Allegedly GPLv2+, but no source visible. Marked: + + Madge Ambassador ATM Adapter microcode. + Copyright (C) 1995-1999 Madge Networks Ltd. + + This microcode data is placed under the terms of the GNU General + Public License. The GPL is contained in /usr/doc/copyright/GPL on a + Debian system and in the file COPYING in the Linux kernel source. + + We would prefer you not to distribute modified versions without + consultation and not to ask for assembly/other microcode source. + + -------------------------------------------------------------------------- + Driver: korg1212 -- Korg 1212 IO audio device File: korg/k1212.dsp @@@ -71,7 -89,6 +89,7 @@@ Licence: Allegedly GPLv2+, but no sourc Copyright (C) 2001 Qlogic Corporation (www.qlogic.com) -------------------------------------------------------------------------- + Driver: smctr -- SMC ISA/MCA Token Ring adapter File: tr_smctr.bin @@@ -381,39 -398,6 +399,39 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- +Driver: SCSI_QLA_FC - QLogic QLA2XXX Fibre Channel + +File: ql2100_fw.bin -- 1.19.38 TP +File: ql2200_fw.bin -- 2.02.08 TP +File: ql2300_fw.bin -- 3.03.20 IPX +File: ql2322_fw.bin -- 3.03.20 IPX +File: ql2400_fw.bin -- 4.04.04 IP +File: ql2500_fw.bin -- 4.04.04 + +Licence: Redistributable. See LICENCE.qla2xxx for details + +Available from ftp://ftp.qlogic.com/outgoing/linux/firmware/ + +-------------------------------------------------------------------------- + +Driver: ORINOCO - Agere/Prism/Symbol Orinoco support + +File: agere_sta_fw.bin -- 9.48 Hermes I +File: agere_ap_fw.bin -- 9.48 Hermes I + +Licence: Redistributable. See LICENCE.agere for details + +-------------------------------------------------------------------------- + +Driver: AR9170 - Atheros 802.11n "otus" USB + +File: ar9170-1.fw +File: ar9170-2.fw + +License: Redistributable. See LICENCE.atheros_firmware for details + +-------------------------------------------------------------------------- + Driver: CASSINI - Sun Cassini File: sun/cassini.bin @@@ -424,65 -408,11 +442,65 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- +Driver: SLICOSS - Alacritech IS-NIC products + +File: slicoss/gbdownload.sys.ihex +File: slicoss/gbrcvucode.sys.ihex +File: slicoss/oasisdbgdownload.sys.ihex +File: slicoss/oasisdownload.sys.ihex +File: slicoss/oasisrcvucode.sys.ihex + +Licence: + Copyright (C) 1999-2009 Alacritech, Inc. + + as an unpublished work. This notice does not imply unrestricted or + public access to the source code from which this firmware image is + derived. Except as noted below this firmware image may not be + reproduced, used, sold or transferred to any third party without + Alacritech's prior written consent. All Rights Reserved. + + Permission is hereby granted for the distribution of this firmware + image as part of a Linux or other Open Source operating system kernel + in text or binary form as required. + + This firmware may not be modified and may only be used with + Alacritech hardware. + +Found in hex form in kernel source. + +-------------------------------------------------------------------------- + +Driver: SXG - Alacritech IS-NIC products + +File: sxg/saharadownloadB.sys.ihex +File: sxg/saharadbgdownloadB.sys.ihex + +Licence: + Copyright (C) 1999-2009 Alacritech, Inc. + + as an unpublished work. This notice does not imply unrestricted or + public access to the source code from which this firmware image is + derived. Except as noted below this firmware image may not be + reproduced, used, sold or transferred to any third party without + Alacritech's prior written consent. All Rights Reserved. + + Permission is hereby granted for the distribution of this firmware + image as part of a Linux or other Open Source operating system kernel + in text or binary form as required. + + This firmware may not be modified and may only be used with + Alacritech hardware. + +Found in hex form in kernel source. + +-------------------------------------------------------------------------- + Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter -File: cxgb3/t3b_psram-1.1.0.bin.ihex -File: cxgb3/t3c_psram-1.1.0.bin.ihex -file: cxgb3/t3fw-7.1.0.bin.ihex +File: cxgb3/t3b_psram-1.1.0.bin +File: cxgb3/t3c_psram-1.1.0.bin +File: cxgb3/t3fw-7.0.0.bin +File: cxgb3/t3fw-7.1.0.bin License: GPLv2 or OpenIB.org BSD license, no source visible @@@ -550,89 -480,6 +568,89 @@@ Found in hex form in kernel source, wit -------------------------------------------------------------------------- +Driver: i2400m-usb - Intel 2400 Wireless WiMAX Connection over USB + +File: i2400m-fw-usb-1.3.sbcf +File: i2400m-fw-usb-1.4.sbcf + +License: Redistributable. See LICENCE.i2400m for details + +Also available from http://linuxwimax.org/Download + +-------------------------------------------------------------------------- + +Driver: libertas - Marvell Libertas fullmac-type 802.11b/g cards + +File: cf8385.bin +File: cf8385_helper.bin +File: gspi8682.bin +File: gspi8682_helper.bin +File: gspi8686_v9.bin +File: gspi8686_v9_helper.bin +File: gspi8688.bin +File: gspi8688_helper.bin +File: sd8385.bin +File: sd8385_helper.bin +File: sd8682.bin +File: sd8682_helper.bin +File: sd8686_v8.bin +File: sd8686_v8_helper.bin +File: sd8686_v9.bin +File: sd8686_v9_helper.bin +File: sd8688.bin +File: sd8688_helper.bin +File: usb8388_v5.bin +File: usb8388_v9.bin +File: usb8682.bin + +License: Redistributable. See libertas/LICENSE for details. Extracted from +Linux driver tarballs downloaded from Marvell's "Extranet" with permission. + +-------------------------------------------------------------------------- + +Driver: mwl8k - Marvell Libertas softmac-type 802.11b/g cards + +File: fmimage_8687.fw +File: helper_8687.fw + +License: Redistributable. See mwl8k/LICENSE for details. Downloaded from +Marvell's "Extranet" with permission. + +-------------------------------------------------------------------------- + + +Driver: iwlwifi - Intel Wireless Wifi + +File: iwlwifi-3945-2.ucode +Info: v15.28.2.8 + +File: iwlwifi-4965-2.ucode +Info: v228.57.2.23 + +File: iwlwifi-5000-1.ucode +Info: v5.4.A.11 (aka v5.4.1.16) + +License: Redistributable. See LICENCE.iwlwifi_firmware for details + +Also available from http://intellinuxwireless.org/?n=Downloads + +-------------------------------------------------------------------------- + +Driver: cx231xx - Conexant Cx23100/101/102 USB broadcast A/V decoder + +File: v4l-cx231xx-avcore-01.fw + +License: + Conexant grants permission to use and redistribute these firmware + files for use with Conexant 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. + +-------------------------------------------------------------------------- + Driver: TEHUTI - Tehuti Networks 10G Ethernet File: tehuti/bdx.bin @@@ -741,54 -588,6 +759,54 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- +Driver: cx23418 - Conexant PCI Broadcast A/V with MPEG encoder + +File: v4l-cx23418-apu.fw +File: v4l-cx23418-cpu.fw +File: v4l-cx23418-dig.fw + +License: + Conexant grants permission to use and redistribute these firmware + files for use with Conexant 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. + +-------------------------------------------------------------------------- + +Driver: cx23885 - Conexant PCI Express Broadcast A/V decoder + +File: v4l-cx23885-avcore-01.fw +File: v4l-cx23885-enc.fw + +License: + Conexant grants permission to use and redistribute these firmware + files for use with Conexant 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. + +-------------------------------------------------------------------------- + +Driver: cx23840 - Conexant sideport Broadcast A/V decoder + +File: v4l-cx25840.fw + +License: + Conexant grants permission to use and redistribute these firmware + files for use with Conexant 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. + +-------------------------------------------------------------------------- + Driver: SCSI_QLOGICPTI - PTI Qlogic, ISP Driver File: qlogic/isp1000.bin @@@ -797,3 -596,55 +815,55 @@@ Licence: Unknow Found in hex form in kernel source. + -------------------------------------------------------------------------- + + Driver: MYRI_SBUS - MyriCOM Gigabit Ethernet + + File: myricom/lanai.bin + + Licence: Unknown + + Found in hex form in kernel source. + + -------------------------------------------------------------------------- + + Driver: BNX2 - Broadcom NetXtremeII + + File: bnx2/bnx2-mips-06-4.6.16.fw + File: bnx2/bnx2-rv2p-06-4.6.16.fw + File: bnx2/bnx2-mips-09-4.6.17.fw + File: bnx2/bnx2-rv2p-09-4.6.15.fw + + Licence: + + This file contains firmware data derived from proprietary unpublished + source code, Copyright (c) 2004 - 2009 Broadcom Corporation. + + Permission is hereby granted for the distribution of this firmware data + in hexadecimal or equivalent format, provided this copyright notice is + accompanying it. + + Found in hex form in kernel source. + + -------------------------------------------------------------------------- + + Driver: DVB AV7110 -- AV7110 cards + + File: av7110/bootcode.bin + + Licence: GPLv2 or later + + ARM assembly source code available at http://www.linuxtv.org/downloads/firmware/Boot.S + + -------------------------------------------------------------------------- + + Driver: wavefront - ISA WaveFront sound card + + File: yamaha/yss225_registers.bin + + Licence: Allegedly GPLv2+, but no source visible. + + Found in hex form in kernel source, with the following comment: + Copyright (c) 1998-2002 by Paul Davis + + --------------------------------------------------------------------------