Merge branch 'master' of git://github.com/kvalo/ath10k-firmware into HEAD
* 'master' of git://github.com/kvalo/ath10k-firmware:
Update README with the new directory layout
Make 10.1.467.2-1 as the default firmware
Disable execution bit for files
Remove FW API 1 files
main: add firmware-2.bin_999.999.0.636
Rename ap directory to 10.1
ap: promote firmware-2.bin_10.1.467.2-1 from untested
ap: add firmware-2.bin_10.1.467.2-1 to untested
Change-Id: I903cc823eea9cfb2538ed740e465fbd44c9462ab
diff --git a/ap/firmware-2.bin-10.1.389 b/10.1/firmware-2.bin-10.1.389
similarity index 100%
rename from ap/firmware-2.bin-10.1.389
rename to 10.1/firmware-2.bin-10.1.389
Binary files differ
diff --git a/ap/firmware-2.bin_10.1.467-1 b/10.1/firmware-2.bin_10.1.467-1
similarity index 100%
rename from ap/firmware-2.bin_10.1.467-1
rename to 10.1/firmware-2.bin_10.1.467-1
Binary files differ
diff --git a/ap/firmware-2.bin_10.1.467.1-1 b/10.1/firmware-2.bin_10.1.467.1-1
similarity index 100%
rename from ap/firmware-2.bin_10.1.467.1-1
rename to 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/ap/untested/firmware-2.bin_10.1.436-1 b/10.1/untested/firmware-2.bin_10.1.436-1
similarity index 100%
rename from ap/untested/firmware-2.bin_10.1.436-1
rename to 10.1/untested/firmware-2.bin_10.1.436-1
Binary files differ
diff --git a/README.md b/README.md
index 6a4b1f2..decdfe5 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,14 @@
Firmware files for ath10k, a mac80211 driver for QCA988x. The
directory structure is:
- * ath10k: the default firmware files, supports all modes
- * ap: firmware images from the AP branch (STA specific features
- might not work)
+ * 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:
diff --git a/ath10k/QCA988X/hw2.0/board.bin b/ath10k/QCA988X/hw2.0/board.bin
old mode 100755
new mode 100644
Binary files differ
diff --git a/ath10k/QCA988X/hw2.0/firmware-2.bin b/ath10k/QCA988X/hw2.0/firmware-2.bin
deleted file mode 120000
index fe57d2b..0000000
--- a/ath10k/QCA988X/hw2.0/firmware-2.bin
+++ /dev/null
@@ -1 +0,0 @@
-../../../ap/firmware-2.bin_10.1.467-1
\ No newline at end of file
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/ath10k/QCA988X/hw2.0/otp.bin b/ath10k/QCA988X/hw2.0/otp.bin
deleted file mode 100755
index 94b11a2..0000000
--- a/ath10k/QCA988X/hw2.0/otp.bin
+++ /dev/null
Binary files differ
diff --git a/ath10k/QCA988X/hw2.0/firmware.bin b/main/firmware-2.bin_999.999.0.636
old mode 100755
new mode 100644
similarity index 96%
rename from ath10k/QCA988X/hw2.0/firmware.bin
rename to main/firmware-2.bin_999.999.0.636
index 08af68c..069ee64
--- a/ath10k/QCA988X/hw2.0/firmware.bin
+++ b/main/firmware-2.bin_999.999.0.636
Binary files differ
