From: David Woodhouse Date: Sat, 8 Jan 2011 22:01:05 +0000 (+0000) Subject: Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/bwh/linux-firmware X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3ba83bfdc98d3270d20b5a4df8bafce3c0ec685;hp=0daab4fab6f644984ea902705a24229345e1aa44;p=linux-firmware Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/bwh/linux-firmware Conflicts: WHENCE --- diff --git a/LICENCE.mwl8335 b/LICENCE.mwl8335 new file mode 100644 index 0000000..0b82452 --- /dev/null +++ b/LICENCE.mwl8335 @@ -0,0 +1,52 @@ +FIRMWARE LICENSE TERMS + + +Copyright (c) Marvell International Ltd. + +All rights reserved. + +Redistribution. Redistribution and use in binary form, without modification, are +permitted provided that the following conditions are met: + +* Redistributions must reproduce the above copyright notice and the following +disclaimer in the documentation and/or other materials provided with the +distribution. + +* Neither the name of Marvell International Ltd. nor the names of its suppliers +may be used to endorse or promote products derived from this software without +specific prior written permission. + +* No reverse engineering, decompilation, or disassembly of this software is +permitted. + +Limited patent license. Marvell International Ltd. grants a world-wide, +royalty-free, non-exclusive license under patents it now or hereafter owns or +controls to make, have made, use, import, offer to sell and sell ("Utilize") +this software, but solely to the extent that any such patent is necessary to +Utilize the software alone, or in combination with an operating system licensed +under an approved Open Source license as listed by the Open Source Initiative at +http://opensource.org/licenses. The patent license shall not apply to any other +combinations which include this software. No hardware per se is licensed +hereunder. + +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. + +---- + +NOTE: this firmware was generated from img_cb35_fw_duplex.h contained in the +GPL source release of the Maxtor Shared Storage II product available here: + +http://www.seagate.com/staticfiles/maxtor/en_us/downloads/MSSII_3.1.2.src.tgz + +Explicit permission from Marvell was obtained to upload this firmware to the +linux-firmware git repository under the Marvell firmware license above. + diff --git a/LICENCE.rtlwifi_firmware.txt b/LICENCE.rtlwifi_firmware.txt new file mode 100644 index 0000000..d70921f --- /dev/null +++ b/LICENCE.rtlwifi_firmware.txt @@ -0,0 +1,39 @@ +Copyright (c) 2010, Realtek Semiconductor Corporation +All rights reserved. + +Redistribution. Redistribution and use in binary form, without +modification, are permitted provided that the following conditions are +met: + +* Redistributions must reproduce the above copyright notice and the + following disclaimer in the documentation and/or other materials + provided with the distribution. +* Neither the name of Realtek Semiconductor Corporation nor the names of its + suppliers may be used to endorse or promote products derived from this + software without specific prior written permission. +* No reverse engineering, decompilation, or disassembly of this software + is permitted. + +Limited patent license. Realtek Semiconductor Corporation grants a world-wide, +royalty-free, non-exclusive license under patents it now or hereafter +owns or controls to make, have made, use, import, offer to sell and +sell ("Utilize") this software, but solely to the extent that any +such patent is necessary to Utilize the software alone, or in +combination with an operating system licensed under an approved Open +Source license as listed by the Open Source Initiative at +http://opensource.org/licenses. The patent license shall not apply to +any other combinations which include this software. No hardware per +se is licensed hereunder. + +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/LICENCE.ti-connectivity b/LICENCE.ti-connectivity new file mode 100644 index 0000000..085f6c7 --- /dev/null +++ b/LICENCE.ti-connectivity @@ -0,0 +1,151 @@ +Texas Instruments Incorporated +Technology and Software Publicly Available +Software (Object Code) License Agreement + + +IMPORTANT - PLEASE READ THE FOLLOWING LICENSE AGREEMENT CAREFULLY. THIS IS + A LEGALLY BINDING AGREEMENT. DO NOT DOWNLOAD THE LICENSED MATERIALS + UNLESS: (1) YOU ARE AUTHORIZED TO ACCEPT AND AGREE TO THE TERMS OF THIS + LICENSE AGREEMENT AND (2) YOU INTEND TO ENTER INTO AND TO BE BOUND BY + THE TERMS OF THIS AGREEMENT. + +This Software License Agreement ("Agreement") is a legal agreement between you + (either an individual or entity) and Texas Instruments Incorporated + ("TI"). The "Licensed Materials" subject to this Agreement include, + in whole or in part, the software programs that accompany this Agreement + and any "on-line" or electronic documentation associated with these + programs. By installing, copying or otherwise using the Licensed + Materials you agree to abide by the terms of this Agreement. + If you choose not to accept or agree with these terms, do not download + or install the Licensed Materials. + + +1. Object Code License. TI hereby grants to you a limited, non-exclusive + license to reproduce and use the Licensed Materials provided to you in + object code format and to distribute an unlimited number of object or + executable copies of such Licensed Materials, provided that such object + or executable copies are used solely and exclusively on devices + manufactured by or for TI. + +2. Termination. This license is effective until terminated. Without prejudice + to any other rights, TI may terminate your right to use the Licensed + Materials under this Agreement if you fail to comply with the terms of + this Agreement. In such event, you shall destroy all copies of the + Licensed Materials, including all portions and derivatives thereof. + +3. Intellectual Property Rights. The Licensed Materials being provided to you + hereunder are being made publicly available by TI, even though they + contain copyrighted material of TI and its licensors, if applicable. + In no event may you alter, remove or destroy any copyright notice + included in the Licensed Materials. To the extent that any of the + Licensed Materials are provided in binary or object code only, you may + not unlock, decompile, reverse engineer, disassemble or otherwise + translate such binary or object code to human-perceivable form. The + source code of such reverse engineered code may contain TI trade secret + and other proprietary information. Further, nothing shall obligate TI + to provide you with source code for the Licensed Materials licensed to + you in binary or object code only under this Agreement. TI reserves all + rights not specifically granted under this Agreement. + +4. Warranties and Limitations. THE LICENSED MATERIALS ARE PROVIDED "AS IS". TI + MAKES NO WARRANTY OR REPRESENTATION, EXPRESS, IMPLIED OR STATUTORY, + INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTIBILITY, FITNESS FOR A + PARTICULAR PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS OF + RESPONSES, RESULTS AND LACK OF NEGLIGENCE. TI DISCLAIMS ANY WARRANTY OF + TITLE, QUIET ENJOYMENT, QUIET POSESSION, AND NON-INFRINGEMENT OF ANY + THIRD PARTY INTELLECTUAL PROPERTY RIGHTS WITH REGARD TO THE LICENSED + MATERIALS OR USE OF THOSE MATERIALS. + +YOU ACKNOWLEDGE AND AGREE THAT THE LICENSED MATERIALS MAY NOT BE INTENDED FOR + PRODUCTION APPLICATIONS AND MAY CONTAIN IRREGULARITIES AND DEFECTS NOT + FOUND IN PRODUCTION SOFTWARE. FURTHERMORE, YOU ACKNOWLEDGE AND AGREE + THAT THE LICENSED MATERIALS HAVE NOT BEEN TESTED OR CERTIFIED BY ANY + GOVERNMENT AGENCY OR INDUSTRY REGULATORY ORGANIZATION OR ANY OTHER THIRD + PARTY ORGANIZATION. YOU AGREE THAT PRIOR TO USING, INCORPORATING OR + DISTRIBUTING THE LICENSED MATERIALS IN OR WITH ANY COMMERCIAL PRODUCT + THAT YOU WILL THOROUGHLY TEST THE PRODUCT AND THE FUNCTIONALITY OF THE + LICENSED MATERIALS IN OR WITH THAT PRODUCT AND BE SOLELY RESPONSIBLE FOR + ANY PROBLEMS OR FAILURES. + +IN NO EVENT SHALL TI, OR ANY APPLICABLE LICENSOR, BE LIABLE FOR ANY SPECIAL, + INDIRECT, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, HOWEVER CAUSED + ON ANY THEORY OF LIABILITY, ARISING IN ANY WAY OUT OF THIS AGREEMENT, + OR YOUR USE OF THE LICENSED MATERIALS, WHETHER OR NOT TI HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. EXCLUDED DAMAGES INCLUDE, + BUT ARE NOT LIMITED TO, COST OF REMOVAL OR REINSTALLATION, OUTSIDE + COMPUTER TIME, LABOR COSTS, LOSS OR CORRUPTION OF DATA, LOSS OF + GOODWILL, LOSS OF PROFITS, LOSS OF SAVINGS, OR LOSS OF USE OR + INTERRUPTION OF BUSINESS OR ANY OTHER ECONOMIC LOSS. IN NO EVENT WILL + TI'S AGGREGATE LIABILITY UNDER THIS AGREEMENT OR ARISING OUT OF YOUR USE + OF THE LICENSED MATERIALS EXCEED FIVE HUNDRED U.S. DOLLARS (US$500). + +Because some jurisdictions do not allow the exclusion or limitation of + incidental or consequential damages or limitation on how long an implied + warranty lasts, the above limitations or exclusions may not apply to + you. + +5. Export Control. Thesoftware programs and any "on-line" documentation as well + as any updates or upgrades to such software programs or documentation + may be subject to the export or import regulations of certain countries. + You agree to comply with all such regulations and acknowledge that you + have the responsibility to obtain any licenses or other authorizations + that may be required to export, re-export or import the Licensed + Materials. + +6. Governing Law, Jurisdiction and Severability. This Agreement will be + governed by and interpreted in accordance with the laws of the State of + Texas, without reference to that state's conflict of laws principles. + This Agreement shall not be governed by the United Nations Convention on + Contracts for the International Sale of Goods, nor shall it be governed + by the Uniform Computer Information Transactions Act (UCITA). Any + dispute arising out of or related to this Agreement will be brought in, + and each party consents to the exclusive jurisdiction and venue in the + state and federal courts sitting in Dallas Country, Texas. Each party + waives all defenses of lack of personal jurisdiction and forum + non-conveniens and agrees that process may be served on either party in + a manner authorized by applicable law or court rule. If for any reason + a court of competent jurisdiction finds any provision of the Agreement + to be unenforceable, that provision will be enforced to the maximum + extent possible to effectuate the intent of the parties and the + remainder of the Agreement shall continue in full force and effect. + +7. PRC Provisions. If you are located in the People's Republic of China ("PRC") + or if the Licensed Materials will be sent to the PRC, the following + provisions shall apply and shall supersede any other provisions in this + Agreement concerning the same subject matter as the following + provisions: + + a. Registration Requirements. You shall be solely responsible for + performing all acts and obtaining all approvals that may be required in + connection with this Agreement by the government of the PRC, including + but not limited to registering pursuant to, and otherwise complying + with, the PRC Measures on the Administration of Software Products, + Management Regulations on Technology Import-Export, and Technology + Import and Export Contract Registration Management Rules. Upon receipt + of such approvals from the government authorities, you shall forward + evidence of all such approvals to TI for its records. In the event that + you fail to obtain any such approval or registration, you shall be + solely responsible for any and all losses, damages or costs resulting + therefrom, and shall indemnify TI for all such losses, damages or costs. + + b. Governing Language. This Agreement is written and executed in + the English language. If a translation of this Agreement is required + for any purpose, including but not limited to registration of the + Agreement pursuant to any governmental laws, regulations or rules, you + shall be solely responsible for creating such translation. Any + translation of this Agreement into a language other than English is + intended solely in order to comply with such laws or for reference + purposes, and the English language version shall be authoritative and + controlling. + +8. Entire Agreement. This is the entire Agreement between you and TI and + supersedes any prior agreement between the parties related to the + subject matter of this Agreement. No amendment or modification of this + Agreement will be effective unless in writing and signed by a duly + authorized representative of TI. You hereby warrant and represent that + you have obtained all authorizations and other applicable consents + required empowering you to enter into this Agreement. + +1 +TILAW-#236402v3 + diff --git a/WHENCE b/WHENCE index 780ebb0..0bc162c 100644 --- a/WHENCE +++ b/WHENCE @@ -671,6 +671,15 @@ Info: v9.193.4.1 File: iwlwifi-6050-4.ucode Info: v9.201.4.1 +File: iwlwifi-6050-5.ucode +Info: v41.28.5.1 + +File: iwlwifi-6000g2a-5.ucode +Info: v17.168.5.1 + +File: iwlwifi-6000g2b-5.ucode +Info: v17.168.5.1 + Licence: Redistributable. See LICENCE.iwlwifi_firmware for details Also available from http://intellinuxwireless.org/?n=Downloads @@ -985,7 +994,7 @@ Found in hex form in kernel source. Driver: netxen_nic - NetXen Multi port (1/10) Gigabit Ethernet NIC File: phanfw.bin -Info: v4.0.517 +Info: v4.0.534 Licence: Redistributable. See LICENCE.phanfw for details. @@ -1101,6 +1110,8 @@ Driver: ath3k - DFU Driver for Atheros bluetooth chipset AR3011 File: ath3k-1.fw Info: v1.0 +Fix EEPROM radio table issue and change PID to 3005 + Licence: Redistributable. See LICENCE.atheros_firmware for details -------------------------------------------------------------------------- @@ -1242,6 +1253,9 @@ File: radeon/JUNIPER_rlc.bin File: radeon/REDWOOD_me.bin File: radeon/REDWOOD_pfp.bin File: radeon/REDWOOD_rlc.bin +File: radeon/PALM_me.bin +File: radeon/PALM_pfp.bin +File: radeon/SUMO_rlc.bin Licence: Redistributable. See LICENSE.radeon_rlc for details. @@ -1374,6 +1388,7 @@ Driver: vxge - Exar X3100 Series 10GbE PCIe I/O Virtualized Server Adapter File: vxge/X3fw.ncf File: vxge/X3fw-pxe.ncf +Version: 1.8.1 Licence: @@ -1404,6 +1419,79 @@ Licence: Redistributable. See LICENCE.broadcom_bcm43xx for details. -------------------------------------------------------------------------- +Driver: wl12xx - Texas Instruments 802.11 wireless LAN driver + +File: wl1271-fw.bin +File: wl1271-nvs.bin +File: wl1271-fw-ap.bin +File: wl1271-nvs-ap.bin + +Licence: See LICENCE.ti-connectivity for details. + + Station: wl1271-fw.bin version 6.1.0.0.343 (RM version 206) + Access Point: wl1271-fw-ap.bin version 6.2.0.0.30 (RM version 6.2.0.0.6) + The nvs file includes two parts: + - radio calibration + - ini setting parameters + + In order to use that files copy them to target FS at /lib/firmware/. + +-------------------------------------------------------------------------- + +Driver: tlg2300 - Telgent 2300 V4L/DVB driver. + +File: tlg2300_firmware.bin + +Licence: + Telegent System grants permission to use and redistribute these + firmware files for use with devices containing the chip tlg2300, 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: r8712u - Reaktek 802.11n WLAN driver for RTL8712U + +File: rtlwifi/rtl8712u.bin + +Licence: Redistributable. See LICENCE.rtlwifi_firmware for details. + +-------------------------------------------------------------------------- + +Driver: rtl8192ce - Reaktek 802.11n WLAN driver for RTL8192CE + +File: rtlwifi/rtl8192cfw.bin + +Licence: Redistributable. See LICENCE.rtlwifi_firmware for details. + +-------------------------------------------------------------------------- + +Driver: rtl8192cu - Realtek 802.11n WLAN driver for RTL8192CU + +File: rtlwifi/rtl8192cufw.bin + +Licence: Redistributable. See LICENCE.rtlwifi_firmware for details. + +-------------------------------------------------------------------------- + +Driver: r8169 - RealTek 8169/8168/8101 ethernet driver. + +File: rtl_nic/rtl8168d-1.fw +File: rtl_nic/rtl8168d-2.fw + +Licence: + * Copyright (c) 2010, Realtek Semiconductor Corporation + * + * Permission is hereby granted for the distribution of this firmware + * data in hexadecimal or equivalent format, provided this copyright + * notice is accompanying it. + +-------------------------------------------------------------------------- + Driver: vt6656 - VIA VT6656 USB wireless driver File: vntwusb.fw diff --git a/ath3k-1.fw b/ath3k-1.fw index 4a5ffb8..63aa9b9 100644 Binary files a/ath3k-1.fw and b/ath3k-1.fw differ diff --git a/iwlwifi-6000g2a-5.ucode b/iwlwifi-6000g2a-5.ucode new file mode 100644 index 0000000..7c639d7 Binary files /dev/null and b/iwlwifi-6000g2a-5.ucode differ diff --git a/iwlwifi-6000g2b-5.ucode b/iwlwifi-6000g2b-5.ucode new file mode 100644 index 0000000..6850959 Binary files /dev/null and b/iwlwifi-6000g2b-5.ucode differ diff --git a/iwlwifi-6050-5.ucode b/iwlwifi-6050-5.ucode new file mode 100644 index 0000000..74a2085 Binary files /dev/null and b/iwlwifi-6050-5.ucode differ diff --git a/mwl8335_duplex.fw b/mwl8335_duplex.fw new file mode 100644 index 0000000..9490d05 Binary files /dev/null and b/mwl8335_duplex.fw differ diff --git a/phanfw.bin b/phanfw.bin index e752a59..00ee700 100644 Binary files a/phanfw.bin and b/phanfw.bin differ diff --git a/radeon/PALM_me.bin b/radeon/PALM_me.bin new file mode 100644 index 0000000..a03030f Binary files /dev/null and b/radeon/PALM_me.bin differ diff --git a/radeon/PALM_pfp.bin b/radeon/PALM_pfp.bin new file mode 100644 index 0000000..94d779f Binary files /dev/null and b/radeon/PALM_pfp.bin differ diff --git a/radeon/SUMO_rlc.bin b/radeon/SUMO_rlc.bin new file mode 100644 index 0000000..a776273 Binary files /dev/null and b/radeon/SUMO_rlc.bin differ diff --git a/rtl_nic/rtl8168d-1.fw b/rtl_nic/rtl8168d-1.fw new file mode 100644 index 0000000..99e002d Binary files /dev/null and b/rtl_nic/rtl8168d-1.fw differ diff --git a/rtl_nic/rtl8168d-2.fw b/rtl_nic/rtl8168d-2.fw new file mode 100644 index 0000000..7022ab0 Binary files /dev/null and b/rtl_nic/rtl8168d-2.fw differ diff --git a/rtlwifi/rtl8192cfw.bin b/rtlwifi/rtl8192cfw.bin new file mode 100644 index 0000000..af71968 Binary files /dev/null and b/rtlwifi/rtl8192cfw.bin differ diff --git a/rtlwifi/rtl8192cufw.bin b/rtlwifi/rtl8192cufw.bin new file mode 100644 index 0000000..3aa7506 Binary files /dev/null and b/rtlwifi/rtl8192cufw.bin differ diff --git a/rtlwifi/rtl8712u.bin b/rtlwifi/rtl8712u.bin new file mode 100644 index 0000000..3f965a6 Binary files /dev/null and b/rtlwifi/rtl8712u.bin differ diff --git a/ti-connectivity/wl1271-fw-ap.bin b/ti-connectivity/wl1271-fw-ap.bin new file mode 100644 index 0000000..dd461b4 Binary files /dev/null and b/ti-connectivity/wl1271-fw-ap.bin differ diff --git a/ti-connectivity/wl1271-fw.bin b/ti-connectivity/wl1271-fw.bin new file mode 100644 index 0000000..6a30713 Binary files /dev/null and b/ti-connectivity/wl1271-fw.bin differ diff --git a/ti-connectivity/wl1271-nvs-ap.bin b/ti-connectivity/wl1271-nvs-ap.bin new file mode 100644 index 0000000..82896bf Binary files /dev/null and b/ti-connectivity/wl1271-nvs-ap.bin differ diff --git a/ti-connectivity/wl1271-nvs.bin b/ti-connectivity/wl1271-nvs.bin new file mode 100644 index 0000000..91978f9 Binary files /dev/null and b/ti-connectivity/wl1271-nvs.bin differ diff --git a/tlg2300_firmware.bin b/tlg2300_firmware.bin new file mode 100644 index 0000000..79bd2a5 Binary files /dev/null and b/tlg2300_firmware.bin differ diff --git a/vxge/X3fw-pxe.ncf b/vxge/X3fw-pxe.ncf index e8bb78c..2ad4f52 100644 Binary files a/vxge/X3fw-pxe.ncf and b/vxge/X3fw-pxe.ncf differ diff --git a/vxge/X3fw.ncf b/vxge/X3fw.ncf index 27abbe9..f127d70 100644 Binary files a/vxge/X3fw.ncf and b/vxge/X3fw.ncf differ