From: David Woodhouse Date: Wed, 17 Mar 2010 20:39:53 +0000 (+0000) Subject: Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab... X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c3ff02adff5f8d492535ae78bf294b5c06baeac;hp=8d8d1300b471b0f3ff4dc8b044a8b5de1b83bb24;p=linux-firmware Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-firmware Conflicts: WHENCE --- diff --git a/LICENCE.atheros_firmware b/LICENCE.atheros_firmware index 40d434b..d336492 100644 --- a/LICENCE.atheros_firmware +++ b/LICENCE.atheros_firmware @@ -1,4 +1,4 @@ -Copyright (c) 2008, Atheros Communications, Inc. +Copyright (c) 2008-2010, Atheros Communications, Inc. All rights reserved. Redistribution. Redistribution and use in binary form, without diff --git a/LICENCE.iwlwifi_firmware b/LICENCE.iwlwifi_firmware index 938004c..82165b8 100644 --- a/LICENCE.iwlwifi_firmware +++ b/LICENCE.iwlwifi_firmware @@ -1,4 +1,4 @@ -Copyright (c) 2006-2009, Intel Corporation. +Copyright (c) 2006-2010, Intel Corporation. All rights reserved. Redistribution. Redistribution and use in binary form, without diff --git a/LICENSE.radeon_rlc b/LICENSE.radeon_rlc new file mode 100644 index 0000000..7d0312b --- /dev/null +++ b/LICENSE.radeon_rlc @@ -0,0 +1,51 @@ +Copyright (C) 2009 Advanced Micro Devices, Inc. All rights reserved. + +REDISTRIBUTION: Permission is hereby granted, free of any license fees, +to any person obtaining a copy of this microcode (the "Software"), to +install, reproduce, copy and distribute copies, in binary form only, of +the Software and to permit persons to whom the Software is provided to +do the same, provided that the following conditions are met: + +No reverse engineering, decompilation, or disassembly of this Software +is permitted. + +Redistributions must reproduce the above copyright notice, this +permission notice, and the following disclaimers and notices in the +Software documentation and/or other materials provided with the +Software. + +DISCLAIMER: THE USE OF THE SOFTWARE IS AT YOUR SOLE RISK. THE SOFTWARE +IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND AND COPYRIGHT +HOLDER AND ITS LICENSORS EXPRESSLY DISCLAIM ALL WARRANTIES, EXPRESS AND +IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. +COPYRIGHT HOLDER AND ITS LICENSORS DO NOT WARRANT THAT THE SOFTWARE WILL +MEET YOUR REQUIREMENTS, OR THAT THE OPERATION OF THE SOFTWARE WILL BE +UNINTERRUPTED OR ERROR-FREE. THE ENTIRE RISK ASSOCIATED WITH THE USE OF +THE SOFTWARE IS ASSUMED BY YOU. FURTHERMORE, COPYRIGHT HOLDER AND ITS +LICENSORS DO NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE +OR THE RESULTS OF THE USE OF THE SOFTWARE IN TERMS OF ITS CORRECTNESS, +ACCURACY, RELIABILITY, CURRENTNESS, OR OTHERWISE. + +DISCLAIMER: UNDER NO CIRCUMSTANCES INCLUDING NEGLIGENCE, SHALL COPYRIGHT +HOLDER AND ITS LICENSORS OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR AGENTS +("AUTHORIZED REPRESENTATIVES") BE LIABLE FOR ANY INCIDENTAL, INDIRECT, +SPECIAL OR CONSEQUENTIAL DAMAGES (INCLUDING DAMAGES FOR LOSS OF BUSINESS +PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, AND THE +LIKE) ARISING OUT OF THE USE, MISUSE OR INABILITY TO USE THE SOFTWARE, +BREACH OR DEFAULT, INCLUDING THOSE ARISING FROM INFRINGEMENT OR ALLEGED +INFRINGEMENT OF ANY PATENT, TRADEMARK, COPYRIGHT OR OTHER INTELLECTUAL +PROPERTY RIGHT EVEN IF COPYRIGHT HOLDER AND ITS AUTHORIZED +REPRESENTATIVES HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN +NO EVENT SHALL COPYRIGHT HOLDER OR ITS AUTHORIZED REPRESENTATIVES TOTAL +LIABILITY FOR ALL DAMAGES, LOSSES, AND CAUSES OF ACTION (WHETHER IN +CONTRACT, TORT (INCLUDING NEGLIGENCE) OR OTHERWISE) EXCEED THE AMOUNT OF +US$10. + +Notice: The Software is subject to United States export laws and +regulations. You agree to comply with all domestic and international +export laws and regulations that apply to the Software, including but +not limited to the Export Administration Regulations administered by the +U.S. Department of Commerce and International Traffic in Arm Regulations +administered by the U.S. Department of State. These laws include +restrictions on destinations, end users and end use. diff --git a/WHENCE b/WHENCE index 19f7558..e38d34e 100644 --- a/WHENCE +++ b/WHENCE @@ -432,6 +432,14 @@ Licence: Redistributable. See LICENCE.atheros_firmware for details -------------------------------------------------------------------------- +Driver: AR9271 - Atheros HTC device (USB) + +File: ar9271.fw + +Licence: Redistributable. See LICENCE.atheros_firmware for details + +-------------------------------------------------------------------------- + Driver: CASSINI - Sun Cassini File: sun/cassini.bin @@ -655,6 +663,9 @@ Info: v8.24.2.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 @@ -1173,9 +1184,18 @@ 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: s2255drv -File: f2255.bin +File: f2255usb.bin File: s2250_loader.fw File: s2250.fw @@ -1187,3 +1207,4 @@ Licence: 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/ar9271.fw b/ar9271.fw new file mode 100644 index 0000000..2398e55 Binary files /dev/null and b/ar9271.fw differ diff --git a/iwlwifi-6000-4.ucode b/iwlwifi-6000-4.ucode new file mode 100644 index 0000000..f9f25e4 Binary files /dev/null and b/iwlwifi-6000-4.ucode differ diff --git a/radeon/R600_rlc.bin b/radeon/R600_rlc.bin new file mode 100644 index 0000000..4b023f3 Binary files /dev/null and b/radeon/R600_rlc.bin differ diff --git a/radeon/R700_rlc.bin b/radeon/R700_rlc.bin new file mode 100644 index 0000000..280568f Binary files /dev/null and b/radeon/R700_rlc.bin differ