aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kyle@kernel.org>2016-09-13 12:14:31 -0400
committerKyle McMartin <kyle@kernel.org>2016-09-13 12:14:31 -0400
commit36c7c78264fa79ed51697c59725840635708d5fd (patch)
treec485dd06dcc6880016cf42ba3d28a2098984f621
parentdfd8b80c8140266e40456de4a8572a4649156610 (diff)
parent1e0f28ad5a26b2c86e55dbad3141b2ec2de804f7 (diff)
downloadfirmware-36c7c78264fa79ed51697c59725840635708d5fd.tar.gz
Merge branch 'master' of git://git.marvell.com/mwifiex-firmware
-rw-r--r--WHENCE10
-rw-r--r--mrvl/pcie8897_uapsta.binbin803884 -> 820212 bytes
-rw-r--r--mrvl/pcieuart8997_combo_v4.binbin0 -> 583628 bytes
-rw-r--r--mrvl/pcieusb8997_combo_v4.binbin0 -> 589048 bytes
-rw-r--r--mrvl/sd8897_uapsta.binbin780760 -> 802164 bytes
5 files changed, 8 insertions, 2 deletions
diff --git a/WHENCE b/WHENCE
index e4edc9ad..228e0e2b 100644
--- a/WHENCE
+++ b/WHENCE
@@ -742,13 +742,13 @@ File: mrvl/usb8797_uapsta.bin
Version: 14.68.29.p49
File: mrvl/sd8897_uapsta.bin
-Version: 15.68.7.p53
+Version: 15.68.7.p77
File: mrvl/usb8897_uapsta.bin
Version: 15.68.4.p103
File: mrvl/pcie8897_uapsta.bin
-Version: 15.68.7.p53
+Version: 15.68.7.p77
File: mrvl/sd8887_uapsta.bin
Version: 15.68.7.p5
@@ -759,6 +759,12 @@ Version: 14.68.36.p60
File: mrvl/usb8801_uapsta.bin
Version: 14.68.36.p60
+File: mrvl/pcieuart8997_combo_v4.bin
+Version: 16.68.1.p70
+
+File: mrvl/pcieusb8997_combo_v4.bin
+Version: 16.68.1.p70
+
Licence: Redistributable. See LICENCE.Marvell for details. Originates from
http://git.marvell.com/?p=mwifiex-firmware.git
diff --git a/mrvl/pcie8897_uapsta.bin b/mrvl/pcie8897_uapsta.bin
index 708bf868..c7316862 100644
--- a/mrvl/pcie8897_uapsta.bin
+++ b/mrvl/pcie8897_uapsta.bin
Binary files differ
diff --git a/mrvl/pcieuart8997_combo_v4.bin b/mrvl/pcieuart8997_combo_v4.bin
new file mode 100644
index 00000000..f6bd185e
--- /dev/null
+++ b/mrvl/pcieuart8997_combo_v4.bin
Binary files differ
diff --git a/mrvl/pcieusb8997_combo_v4.bin b/mrvl/pcieusb8997_combo_v4.bin
new file mode 100644
index 00000000..5f5731f4
--- /dev/null
+++ b/mrvl/pcieusb8997_combo_v4.bin
Binary files differ
diff --git a/mrvl/sd8897_uapsta.bin b/mrvl/sd8897_uapsta.bin
index 8c510773..0edfde11 100644
--- a/mrvl/sd8897_uapsta.bin
+++ b/mrvl/sd8897_uapsta.bin
Binary files differ