From: Ben Hutchings Date: Wed, 10 Mar 2010 00:13:18 +0000 (+0000) Subject: Merge remote branch 'origin/master' into master X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0989e227d506d523ba9c089a52294c21c6cdbfaa;hp=-c;p=linux-firmware Merge remote branch 'origin/master' into master Conflicts: WHENCE --- 0989e227d506d523ba9c089a52294c21c6cdbfaa diff --combined WHENCE index 8450383,5e502b8..f3d3e98 --- a/WHENCE +++ b/WHENCE @@@ -10,7 -10,7 +10,7 @@@ kernel Driver: ambassador -- Madge Ambassador (Collage PCI 155 Server) ATM NIC. -File: firmware/atmsar11.fw +File: atmsar11.fw Licence: Allegedly GPLv2+, but no source visible. Marked: @@@ -26,7 -26,7 +26,7 @@@ -------------------------------------------------------------------------- -Driver: korg1212 -- Korg 1212 IO audio device +Driver: snd-korg1212 -- Korg 1212 IO audio device File: korg/k1212.dsp @@@ -36,7 -36,7 +36,7 @@@ Found in alsa-firmware package in hex f -------------------------------------------------------------------------- -Driver: maestro3 -- ESS Allegro Maestro3 audio device +Driver: snd-maestro3 -- ESS Allegro Maestro3 audio device File: ess/maestro3_assp_kernel.fw File: ess/maestro3_assp_minisrc.fw @@@ -50,7 -50,7 +50,7 @@@ specs on the dsp. -------------------------------------------------------------------------- -Driver: ymfpci -- Yamaha YMF724/740/744/754 audio devices +Driver: snd-ymfpci -- Yamaha YMF724/740/744/754 audio devices File: yamaha/ds1_ctrl.fw File: yamaha/ds1_dsp.fw @@@ -63,7 -63,7 +63,7 @@@ Found alsa-firmware package in hex form -------------------------------------------------------------------------- -Driver: SCSI_ADVANSYS - AdvanSys SCSI +Driver: advansys - AdvanSys SCSI File: advansys/mcode.bin File: advansys/3550.bin @@@ -76,7 -76,7 +76,7 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- -Driver: SCSI_QLOGIC_1280 - Qlogic QLA 1240/1x80/1x160 SCSI support +Driver: qla1280 - Qlogic QLA 1240/1x80/1x160 SCSI support File: qlogic/1040.bin File: qlogic/1280.bin @@@ -116,7 -116,7 +116,7 @@@ Found in hex form in the kernel source -------------------------------------------------------------------------- -Driver: ttusb-budget -- Technotrend/Hauppauge Nova-USB devices +Driver: dvb-ttusb-budget -- Technotrend/Hauppauge Nova-USB devices File: ttusb-budget/dspbootcode.bin @@@ -271,6 -271,7 +271,6 @@@ File: whiteheat.f Version: 4.06 File: whiteheat_loader.fw -File: whiteheat_loader_debug.fw Licence: Allegedly GPLv2, but no source visible. Marked: Copyright (C) 2000-2002 ConnectTech Inc @@@ -295,7 -296,7 +295,7 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- -Driver: CPiA2 -- cameras based on Vision's CPiA2 +Driver: cpia2 -- cameras based on Vision's CPiA2 File: cpia2/stv0672_vp4.bin @@@ -308,7 -309,7 +308,7 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- -Driver: DABUSB -- Digital Audio Broadcasting (DAB) Receiver for USB and Linux +Driver: dabusb -- Digital Audio Broadcasting (DAB) Receiver for USB and Linux File: dabusb/firmware.fw File: dabusb/bitstream.bin @@@ -324,7 -325,7 +324,7 @@@ Licence: Distributabl -------------------------------------------------------------------------- -Driver: USB_VICAM -- USB 3com HomeConnect (aka vicam) +Driver: vicam -- USB 3com HomeConnect (aka vicam) File: vicam/firmware.fw @@@ -334,7 -335,7 +334,7 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- -Driver: USB_SERIAL_EDGEPORT - USB Inside Out Edgeport Serial Driver +Driver: io_edgeport - USB Inside Out Edgeport Serial Driver File: edgeport/boot.fw File: edgeport/boot2.fw @@@ -352,7 -353,7 +352,7 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- -Driver: USB_SERIAL_EDGEPORT_TI - USB Inside Out Edgeport Serial Driver +Driver: io_ti - USB Inside Out Edgeport Serial Driver (TI Devices) File: edgeport/down3.bin @@@ -368,7 -369,7 +368,7 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- -Driver: ATARI_DSP56K - Atari DSP56k support +Driver: dsp56k - Atari DSP56k support File: dsp56k/bootstrap.bin Source: dsp56k/bootstrap.asm @@@ -380,7 -381,7 +380,7 @@@ http://www.zdomain.com/a56.htm -------------------------------------------------------------------------- -Driver: SND_SB16_CSP - Sound Blaster 16/AWE CSP support +Driver: snd-sb16-csp - Sound Blaster 16/AWE CSP support File: sb16/mulaw_main.csp File: sb16/alaw_main.csp @@@ -398,7 -399,7 +398,7 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- -Driver: SCSI_QLA_FC - QLogic QLA2XXX Fibre Channel +Driver: qla2xxx - QLogic QLA2XXX Fibre Channel File: ql2100_fw.bin -- 1.19.38 TP File: ql2200_fw.bin -- 2.02.08 TP @@@ -413,7 -414,7 +413,7 @@@ Available from ftp://ftp.qlogic.com/out -------------------------------------------------------------------------- -Driver: ORINOCO - Agere/Prism/Symbol Orinoco support +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 @@@ -422,7 -423,7 +422,7 @@@ Licence: Redistributable. See LICENCE.a -------------------------------------------------------------------------- -Driver: AR9170 - Atheros 802.11n "otus" USB +Driver: ar9170 - Atheros 802.11n "otus" USB File: ar9170-1.fw File: ar9170-2.fw @@@ -431,7 -432,15 +431,15 @@@ Licence: Redistributable. See LICENCE.a -------------------------------------------------------------------------- -Driver: AR9271 - Atheros HTC device (USB) ++Driver: ar9271 - Atheros HTC device (USB) + + File: ar9271.fw + + Licence: Redistributable. See LICENCE.atheros_firmware for details + + -------------------------------------------------------------------------- + -Driver: CASSINI - Sun Cassini +Driver: cassini - Sun Cassini File: sun/cassini.bin @@@ -441,7 -450,7 +449,7 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- -Driver: SLICOSS - Alacritech IS-NIC products +Driver: slicoss - Alacritech IS-NIC products File: slicoss/gbdownload.sys File: slicoss/gbrcvucode.sys @@@ -468,7 -477,7 +476,7 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- -Driver: SXG - Alacritech IS-NIC products +Driver: sxg - Alacritech IS-NIC products File: sxg/saharadownloadB.sys File: sxg/saharadbgdownloadB.sys @@@ -498,7 -507,7 +506,7 @@@ File: cxgb3/t3b_psram-1.1.0.bi File: cxgb3/t3c_psram-1.1.0.bin File: cxgb3/t3fw-7.0.0.bin File: cxgb3/t3fw-7.1.0.bin -file: cxgb3/t3fw-7.4.0.bin +File: cxgb3/t3fw-7.4.0.bin Licence: GPLv2 or OpenIB.org BSD license, no source visible @@@ -506,9 -515,9 +514,9 @@@ Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter -File: cxgb3/ael2005_opt_edc.bin.ihex -File: cxgb3/ael2005_twx_edc.bin.ihex -File: cxgb3/ael2020_twx_edc.bin.ihex +File: cxgb3/ael2005_opt_edc.bin +File: cxgb3/ael2005_twx_edc.bin +File: cxgb3/ael2020_twx_edc.bin Licence: * Copyright (c) 2007-2009 NetLogic Microsystems, Inc. @@@ -545,7 -554,7 +553,7 @@@ http://alteon.shareable.org -------------------------------------------------------------------------- -Driver: tigon3 -- Broadcom Tigon3 based gigabit Ethernet cards +Driver: tg3 -- Broadcom Tigon3 based gigabit Ethernet cards File: tigon/tg3.bin File: tigon/tg3_tso.bin @@@ -564,7 -573,7 +572,7 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- -Driver: ADAPTEC_STARFIRE - Adaptec Starfire/DuraLAN support +Driver: starfire - Adaptec Starfire/DuraLAN support File: adaptec/starfire_rx.bin File: adaptec/starfire_tx.bin @@@ -596,27 -605,27 +604,27 @@@ Also available from http://linuxwimax.o 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 +File: libertas/cf8385.bin +File: libertas/cf8385_helper.bin +File: libertas/gspi8682.bin +File: libertas/gspi8682_helper.bin +File: libertas/gspi8686_v9.bin +File: libertas/gspi8686_v9_helper.bin +File: libertas/gspi8688.bin +File: libertas/gspi8688_helper.bin +File: libertas/sd8385.bin +File: libertas/sd8385_helper.bin +File: libertas/sd8682.bin +File: libertas/sd8682_helper.bin +File: libertas/sd8686_v8.bin +File: libertas/sd8686_v8_helper.bin +File: libertas/sd8686_v9.bin +File: libertas/sd8686_v9_helper.bin +File: libertas/sd8688.bin +File: libertas/sd8688_helper.bin +File: libertas/usb8388_v5.bin +File: libertas/usb8388_v9.bin +File: libertas/usb8682.bin Licence: Redistributable. See LICENCE.libertas for details. Extracted from Linux driver tarballs downloaded from Marvell's "Extranet" with permission. @@@ -625,8 -634,8 +633,8 @@@ Driver: mwl8k - Marvell Libertas softmac-type 802.11b/g cards -File: fmimage_8687.fw -File: helper_8687.fw +File: mwl8k/fmimage_8687.fw +File: mwl8k/helper_8687.fw Licence: Redistributable. See LICENCE.mwl8k for details. Downloaded from Marvell's "Extranet" with permission. @@@ -654,6 -663,9 +662,9 @@@ Info: v8.24.2. File: iwlwifi-1000-3.ucode Info: v128.50.3.1 + File: iwlwifi-6000-4.ucode + Info: v9.193.4.1 + Licence: Redistributable. See LICENCE.iwlwifi_firmware for details Also available from http://intellinuxwireless.org/?n=Downloads @@@ -675,7 -687,7 +686,7 @@@ Licence -------------------------------------------------------------------------- -Driver: TEHUTI - Tehuti Networks 10G Ethernet +Driver: tehuti - Tehuti Networks 10G Ethernet File: tehuti/bdx.bin @@@ -691,7 -703,7 +702,7 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- -Driver: TYPHOON - 3cr990 series Typhoon +Driver: typhoon - 3cr990 series Typhoon File: 3com/typhoon.bin @@@ -733,7 -745,7 +744,7 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- -Driver: YAM - YAM driver for AX.25 +Driver: yam - YAM driver for AX.25 File: yam/1200.bin File: yam/9600.bin @@@ -745,7 -757,7 +756,7 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- -Driver: 3C359 - 3Com 3C359 Token Link Velocity XL adapter +Driver: 3c359 - 3Com 3C359 Token Link Velocity XL adapter File: 3com/3C359.bin @@@ -771,14 -783,14 +782,14 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- -Driver: PCMCIA_PCNET - NE2000 compatible PCMCIA adapter +Driver: pcnet_cs - NE2000 compatible PCMCIA adapter File: cis/LA-PCM.cis - cis/PCMLM28.cis - cis/DP83903.cis - cis/NE2K.cis - cis/tamarack.cis - cis/PE-200.cis +File: cis/PCMLM28.cis +File: cis/DP83903.cis +File: cis/NE2K.cis +File: cis/tamarack.cis +File: cis/PE-200.cis Licence: GPL @@@ -786,7 -798,7 +797,7 @@@ Originally developed by the pcmcia-cs p -------------------------------------------------------------------------- -Driver: PCMCIA_3C589 - 3Com PCMCIA adapter +Driver: 3c589_cs - 3Com PCMCIA adapter File: cis/3CXEM556.cis @@@ -796,7 -808,7 +807,7 @@@ Originally developed by the pcmcia-cs p -------------------------------------------------------------------------- -Driver: PCMCIA_3C574 - 3Com PCMCIA adapter +Driver: 3c574_cs - 3Com PCMCIA adapter File: cis/3CCFEM556.cis @@@ -806,12 -818,15 +817,12 @@@ Originally developed by the pcmcia-cs p -------------------------------------------------------------------------- -Driver: SERIAL_8250_CS - Serial PCMCIA adapter +Driver: serial_cs - Serial PCMCIA adapter File: cis/MT5634ZLX.cis - cis/RS-COM-2P.cis - cis/COMpad2.cis - cis/COMpad4.cis - cis/SW_555_SER.cis - cis/SW_7xx_SER.cis - cis/SW_8xx_SER.cis +File: cis/RS-COM-2P.cis +File: cis/COMpad2.cis +File: cis/COMpad4.cis Licence: GPL @@@ -819,19 -834,7 +830,19 @@@ Originally developed by the pcmcia-cs p -------------------------------------------------------------------------- -Driver: PCMCIA_SMC91C92 - SMC 91Cxx PCMCIA +Driver: serial_cs - Serial PCMCIA adapter + +File: cis/SW_555_SER.cis +File: cis/SW_7xx_SER.cis +File: cis/SW_8xx_SER.cis + +Licence: GPLv3 + +Copyright Sierra Wireless + +-------------------------------------------------------------------------- + +Driver: smc91c92_cs - SMC 91Cxx PCMCIA File: ositech/Xilinx7OD.bin @@@ -891,7 -894,7 +902,7 @@@ Licence -------------------------------------------------------------------------- -Driver: SCSI_QLOGICPTI - PTI Qlogic, ISP Driver +Driver: qlogicpti - PTI Qlogic, ISP Driver File: qlogic/isp1000.bin @@@ -901,7 -904,7 +912,7 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- -Driver: MYRI_SBUS - MyriCOM Gigabit Ethernet +Driver: myri_sbus - MyriCOM Gigabit Ethernet File: myricom/lanai.bin @@@ -915,8 -918,8 +926,8 @@@ Driver: bnx2x: Broadcom Everes File: bnx2x-e1-4.8.53.0.fw File: bnx2x-e1h-4.8.53.0.fw -File: bnx2x-e1-5.2.7.0.fw.ihex -File: bnx2x-e1h-5.2.7.0.fw.ihex +File: bnx2x-e1-5.2.7.0.fw +File: bnx2x-e1h-5.2.7.0.fw Licence: Copyright (c) 2007-2009 Broadcom Corporation @@@ -933,7 -936,7 +944,7 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- -Driver: BNX2 - Broadcom NetXtremeII +Driver: bnx2 - Broadcom NetXtremeII File: bnx2/bnx2-mips-06-4.6.16.fw File: bnx2/bnx2-mips-06-5.0.0.j3.fw @@@ -958,7 -961,7 +969,7 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- -Driver: DVB AV7110 -- AV7110 cards +Driver: dvb-ttpci -- AV7110 cards File: av7110/bootcode.bin @@@ -968,7 -971,7 +979,7 @@@ ARM assembly source code available at h -------------------------------------------------------------------------- -Driver: wavefront - ISA WaveFront sound card +Driver: snd-wavefront - ISA WaveFront sound card File: yamaha/yss225_registers.bin @@@ -1009,32 -1012,20 +1020,32 @@@ Downloaded from http://www.ralinktech.c -------------------------------------------------------------------------- -Driver: rt2870sta - Ralink RT2870 wireless MACs +Driver: rt2860sta - Ralink RT3090 wireless MACs + +File: rt3090.bin + +Licence: Redistributable. See LICENCE.ralink-firmware.txt for details + +Found in hex form in kernel source. + +-------------------------------------------------------------------------- + +Driver: rt2870sta - Ralink RT2870, RT3070, RT3071, RT3072 wireless MACs File: rt2870.bin +File: rt3070.bin +File: rt3071.bin Licence: Redistributable. See LICENCE.ralink-firmware.txt for details -Downloaded from http://www.ralinktech.com/ralink/Home/Support/Linux.html +Found in hex form in kernel source. -------------------------------------------------------------------------- Driver: usbdux/usbduxfast - usbdux data acquisition cards File: usbdux_firmware.bin -File: usbdixfast_firmware.bin +File: usbduxfast_firmware.bin Source: usbdux/fx2-include.asm Source: usbdux/usbduxfast_firmware.asm Source: usbdux/usbdux_firmware.asm @@@ -1063,7 -1054,7 +1074,7 @@@ Licence: Redistributable. See LICENCE.d -------------------------------------------------------------------------- -Driver: DFU Driver for Atheros bluetooth chipset AR3011 +Driver: ath3k - DFU Driver for Atheros bluetooth chipset AR3011 File: ath3k-1.fw Info: v1.0 @@@ -1193,12 -1184,11 +1204,21 @@@ Found in hex form in kernel source -------------------------------------------------------------------------- + Driver: radeon - ATI Radeon + + File: radeon/R600_rlc.bin + File: radeon/R700_rlc.bin + + Licence: Redistributable. See LICENSE.radeon_rlc for details. + + -------------------------------------------------------------------------- ++ +Driver: lgs8gxx - Legend Silicon GB20600 demodulator driver + +File: lgs8g75.fw + +Licence: Unknown + +Found in hex form in kernel source. + +--------------------------------------------------------------------------