Merge branch 'master' of git://git.marvell.com/mwifiex-firmware
Conflicts:
WHENCE
mrvl/sd8897_uapsta.bin
mrvl/usb8897_uapsta.bin
Conflicts resolved with:
git checkout --theirs WHENCE
git checkout --theirs mrvl/sd8897_uapsta.bin
git checkout --theirs mrvl/usb8897_uapsta.bin
Change-Id: Ie20ea5a3e01c41495fade64325f3b0e07707d385
diff --git a/10.1/firmware-2.bin-10.1.389 b/10.1/firmware-2.bin-10.1.389
new file mode 100644
index 0000000..4623227
--- /dev/null
+++ b/10.1/firmware-2.bin-10.1.389
Binary files differ
diff --git a/10.1/firmware-2.bin_10.1.467-1 b/10.1/firmware-2.bin_10.1.467-1
new file mode 100644
index 0000000..ae0c99c
--- /dev/null
+++ b/10.1/firmware-2.bin_10.1.467-1
Binary files differ
diff --git a/10.1/firmware-2.bin_10.1.467.1-1 b/10.1/firmware-2.bin_10.1.467.1-1
new file mode 100644
index 0000000..f37d4c5
--- /dev/null
+++ b/10.1/firmware-2.bin_10.1.467.1-1
Binary files differ
diff --git a/10.1/firmware-2.bin_10.1.467.2-1 b/10.1/firmware-2.bin_10.1.467.2-1
new file mode 100644
index 0000000..1777b57
--- /dev/null
+++ b/10.1/firmware-2.bin_10.1.467.2-1
Binary files differ
diff --git a/10.1/untested/firmware-2.bin_10.1.436-1 b/10.1/untested/firmware-2.bin_10.1.436-1
new file mode 100644
index 0000000..448de55
--- /dev/null
+++ b/10.1/untested/firmware-2.bin_10.1.436-1
Binary files differ
diff --git a/LICENSE.qca_firmware b/LICENSE.qca_firmware
new file mode 100644
index 0000000..66cb23a
--- /dev/null
+++ b/LICENSE.qca_firmware
@@ -0,0 +1,44 @@
+Copyright (c) 2013 Qualcomm Atheros, Inc.
+
+All rights reserved.
+
+Redistribution and use in binary forms, without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+* Redistributions must reproduce the above copyright notice, this list
+ of conditions, 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
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+* No Reverse engineering, decompiling, decrypting, or disassembling of
+ this software is permitted.
+
+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. NO LICENSES OR OTHER RIGHTS,
+WHETHER EXPRESS, IMPLIED, BASED ON ESTOPPEL OR OTHERWISE, ARE GRANTED
+TO ANY PARTY'S PATENTS, PATENT APPLICATIONS, OR PATENTABLE INVENTIONS
+BY VIRTUE OF THIS LICENSE OR THE DELIVERY OR PROVISION BY QUALCOMM
+ATHEROS, INC. OF THE SOFTWARE.
+
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR ANY CONTRIBUTOR BE LIABLE FOR
+ANY 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 REGARDLESS OF ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF OR RESULTING FROM THE USE OF THE
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN ANY
+EVENT, THE TOTAL AGGREGATE LIABILITY THAT MAY BE IMPOSED ON QUALCOMM
+ATHEROS, INC. FOR ANY DIRECT DAMAGES ARISING UNDER OR RESULTING FROM
+THIS AGREEMENT OR IN CONNECTION WITH ANY USE OF THE SOFTWARE SHALL NOT
+EXCEED A TOTAL AMOUNT OF US$5.00.
+
+IF ANY OF THE ABOVE PROVISIONS ARE HELD TO BE VOID, INVALID,
+UNENFORCEABLE, OR ILLEGAL, THE OTHER PROVISIONS SHALL CONTINUE IN FULL
+FORCE AND EFFECT.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..decdfe5
--- /dev/null
+++ b/README.md
@@ -0,0 +1,20 @@
+ath10k-firmware
+===============
+
+Firmware files for ath10k, a mac80211 driver for QCA988x. The
+directory structure is:
+
+ * ath10k: the default firmware files, copy this directory structure
+ to your firmware file location, most likely /lib/firmware/
+
+ * 10.1: firmware images from the 10.1 firmware branch, primary use
+ case AP mode, STA specific features might not work
+
+ * main: firmware images from the "main" firmware branch, primary use
+ case STA mode
+
+For more information check the wiki:
+
+http://wireless.kernel.org/en/users/Drivers/ath10k/firmware
+
+
diff --git a/ath10k/QCA988X/hw2.0/board.bin b/ath10k/QCA988X/hw2.0/board.bin
new file mode 100644
index 0000000..8f8bd6b
--- /dev/null
+++ b/ath10k/QCA988X/hw2.0/board.bin
Binary files differ
diff --git a/ath10k/QCA988X/hw2.0/firmware-2.bin b/ath10k/QCA988X/hw2.0/firmware-2.bin
new file mode 100644
index 0000000..1777b57
--- /dev/null
+++ b/ath10k/QCA988X/hw2.0/firmware-2.bin
Binary files differ
diff --git a/main/firmware-2.bin_999.999.0.636 b/main/firmware-2.bin_999.999.0.636
new file mode 100644
index 0000000..069ee64
--- /dev/null
+++ b/main/firmware-2.bin_999.999.0.636
Binary files differ
