[firmware-nonfree] 18/24: atheros: Include firmware for Atheros AR3012 rev 11020100 and Qualcomm Atheros QCA988X
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sun Oct 18 13:49:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository firmware-nonfree.
commit 1ee151729463ac6926e465b58cb41fc1d740cf87
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Sun Oct 18 06:10:17 2015 +0100
atheros: Include firmware for Atheros AR3012 rev 11020100 and Qualcomm Atheros QCA988X
The latter has a slightly different licence, so convert copyright file to
structured format.
---
debian/changelog | 2 +
debian/config/atheros/LICENSE | 132 ++++++++++++++++++++++++++++--------------
debian/config/atheros/defines | 14 ++++-
3 files changed, 105 insertions(+), 43 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1ac0a2d..1140a3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ firmware-nonfree (20151018-1) UNRELEASED; urgency=medium
* amd-graphics: Include microcode for "Carrizo", "Fiji", "Tonga" and "Topaz"
chips supported by the amdgpu driver
* misc-nonfree: Update Chelsio T4 and T5 firmware to version 1.14.4.0
+ * atheros: Include firmware for Atheros AR3012 rev 11020100 and
+ Qualcomm Atheros QCA988X
[ maximilian attems ]
* iwlwifi: Update Intel Wireless 3160, 7260, 7265 and 7265D firmware version
diff --git a/debian/config/atheros/LICENSE b/debian/config/atheros/LICENSE
index 215f72d..59e04ea 100644
--- a/debian/config/atheros/LICENSE
+++ b/debian/config/atheros/LICENSE
@@ -1,43 +1,91 @@
-The file ar9170.fw was downloaded from
-http://www.kernel.org/pub/linux/kernel/people/mcgrof/firmware/ar9170/2010-02-03/
+Files: ar3k/*, ar5523.bin, ar7010.fw, ar7010_1_1.fw, ar9271.fw, ath3k-1.fw,
+ ath6k/*/*/*, htc_7010.fw, htc_9271.fw
+Copyright: 2008-2010, Atheros Communications, Inc.
+License: Binary redistribution (Atheros)
+ 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 Atheros Communications, Inc. 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. Atheros Communications, Inc. 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
+ in conjunction with an Atheros Chipset. 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.
-Copyright (c) 2008-2010, Atheros Communications, Inc.
-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 Atheros Communications, Inc. 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. Atheros Communications, Inc. 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.
+Files: ath10k/QCA988X/hw2.0/firmware-4.bin
+Copyright: 2015, Qualcomm Atheros, Inc.
+License: Binary redistribution (Qualcomm Atheros)
+ All rights reserved.
+ .
+ Redistribution. Reproduction and redistribution in binary form, without
+ modification, for use solely in conjunction with a Qualcomm Atheros, Inc.
+ chipset, is 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 Qualcomm Atheros, Inc. 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. Qualcomm Atheros, Inc. (“Licensor”) grants you
+ (“Licensee”) a limited, worldwide, royalty-free, non-exclusive license under
+ the Patents to make, have made, use, import, offer to sell and sell the
+ Software. No hardware per se is licensed hereunder.
+ The term “Patents” as used in this agreement means only those patents or patent
+ applications owned solely and exclusively by Licensor as of the date of
+ Licensor’s submission of the Software and any patents deriving priority (i.e.,
+ having a first effective filing date) therefrom. The term “Software” as used in
+ this agreement means the firmware image submitted by Licensor, under the terms
+ of this license, to git://git.kernel.org/pub/scm/linux/kernel/git/firmware/
+ linux-firmware.git.
+ Notwithstanding anything to the contrary herein, Licensor does not grant and
+ Licensee does not receive, by virtue of this agreement or the Licensor’s
+ submission of any Software, any license or other rights under any patent or
+ patent application owned by any affiliate of Licensor or any other entity
+ (other than Licensor), whether expressly, impliedly, by virtue of estoppel or
+ exhaustion, or otherwise.
+ .
+ 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/debian/config/atheros/defines b/debian/config/atheros/defines
index 9fcca94..f9444fb 100644
--- a/debian/config/atheros/defines
+++ b/debian/config/atheros/defines
@@ -5,6 +5,7 @@ files:
ar3k/AthrBT_0x01020200.dfu
ar3k/AthrBT_0x01020201.dfu
ar3k/AthrBT_0x11020000.dfu
+ ar3k/AthrBT_0x11020100.dfu
ar3k/AthrBT_0x31010000.dfu
ar3k/AthrBT_0x41020000.dfu
ar3k/ramps_0x01020001_26.dfu
@@ -13,12 +14,14 @@ files:
ar3k/ramps_0x01020201_26.dfu
ar3k/ramps_0x01020201_40.dfu
ar3k/ramps_0x11020000_40.dfu
+ ar3k/ramps_0x11020100_40.dfu
ar3k/ramps_0x31010000_40.dfu
ar3k/ramps_0x41020000_40.dfu
ar5523.bin
ar7010.fw
ar7010_1_1.fw
ar9271.fw
+ ath10k/QCA988X/hw2.0/firmware-4.bin
ath3k-1.fw
ath6k/AR6003.1/hw2.1.1/athwlan.bin
ath6k/AR6003.1/hw2.1.1/bdata.SD31.bin
@@ -55,7 +58,7 @@ files:
htc_7010.fw
htc_9271.fw
longdesc: USB wireless network and Bluetooth cards supported by the ar5523,
- ath3k, ath6kl_sdio, ath6kl_usb or ath9k_htc drivers
+ ath3k, ath6kl_sdio, ath6kl_usb, ath9k_htc or ath10k drivers
[ar3k/AthrBT_0x01020001.dfu_base]
desc: Atheros AR3012 rev 01020001 patch
@@ -70,6 +73,9 @@ version: 170
[ar3k/AthrBT_0x11020000.dfu_base]
desc: Atheros AR3012 rev 11020000 patch
+[ar3k/AthrBT_0x11020100.dfu_base]
+desc: Atheros AR3012 rev 11020100 patch
+
[ar3k/AthrBT_0x31010000.dfu_base]
desc: Atheros AR3012 rev 31010000 patch
@@ -94,6 +100,9 @@ desc: Atheros AR3012 rev 01020201 40 MHz config
[ar3k/ramps_0x11020000_40.dfu_base]
desc: Atheros AR3012 rev 11020000 config
+[ar3k/ramps_0x11020100_40.dfu_base]
+desc: Atheros AR3012 rev 11020100 config
+
[ar3k/ramps_0x31010000_40.dfu_base]
desc: Atheros AR3012 rev 31010000 config
@@ -112,6 +121,9 @@ desc: Atheros AR7010 rev 1.1 firmware
[ar9271.fw_base]
desc: Atheros AR9271 firmware
+[ath10k/QCA988X/hw2.0/firmware-4.bin]
+desc: Qualcomm Atheros QCA988X firmware
+
[ath3k-1.fw_base]
desc: Atheros AR3011 firmware
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/firmware-nonfree.git
More information about the Kernel-svn-changes
mailing list