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/WHENCE b/WHENCE
index c6fc28b..2db3140 100644
--- a/WHENCE
+++ b/WHENCE
@@ -730,19 +730,16 @@
Version: 14.66.11.p151
File: mrvl/sd8897_uapsta.bin
-Version: 15.68.4.p7
+Version: 15.68.4.p22
File: mrvl/usb8797_uapsta.bin
Version: 14.68.29.p26
File: mrvl/usb8897_uapsta.bin
-Version: 15.68.201.p113
-
-File: mrvl/usb8897_uapsta.bin
-Version: 15.68.201.p113
+Version: 15.68.4.p22
File: mrvl/pcie8897_uapsta.bin
-Version: 15.69.2.p11
+Version: 15.68.4.p22
Licence: Redistributable. See LICENCE.Marvell for details. Originates from
http://git.marvell.com/?p=mwifiex-firmware.git
@@ -816,17 +813,17 @@
Version: 22.1.7.0
File: iwlwifi-7260-8.ucode
-Version: 22.15.8.0
+Version: 22.24.8.0
File: iwlwifi-3160-7.ucode
Version: 22.1.7.0
File: iwlwifi-3160-8.ucode
-Version: 22.15.8.0
+Version: 22.24.8.0
Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
-Also available from http://intellinuxwireless.org/?n=Downloads
+Also available from http://wireless.kernel.org/en/users/Drivers/iwlwifi/?n=Downloads
--------------------------------------------------------------------------
@@ -1137,6 +1134,9 @@
File: bnx2x/bnx2x-e1-7.8.17.0.fw
File: bnx2x/bnx2x-e1h-7.8.17.0.fw
File: bnx2x/bnx2x-e2-7.8.17.0.fw
+File: bnx2x/bnx2x-e1-7.8.19.0.fw
+File: bnx2x/bnx2x-e1h-7.8.19.0.fw
+File: bnx2x/bnx2x-e2-7.8.19.0.fw
License:
Copyright (c) 2007-2011 Broadcom Corporation
@@ -1723,6 +1723,7 @@
File: brcm/brcmfmac4330-sdio.bin
File: brcm/brcmfmac4334-sdio.bin
File: brcm/brcmfmac4335-sdio.bin
+File: brcm/brcmfmac43362-sdio.bin
File: brcm/brcmfmac43241b0-sdio.bin
File: brcm/brcmfmac43241b4-sdio.bin
@@ -1838,6 +1839,8 @@
Version: 8.2.0.0.100
File: ti-connectivity/wl18xx-fw-2.bin
Version: 8.5.0.0.55
+File: ti-connectivity/wl18xx-fw-3.bin
+Version: 8.8.0.0.13
File: ti-connectivity/wl18xx-conf.bin
Version: 6/5
@@ -1901,9 +1904,9 @@
Driver: rtl8192cu - Realtek 802.11n WLAN driver for RTL8192CU
File: rtlwifi/rtl8192cufw.bin
-FILE: rtlwifi/rtl8192cufw_A.bin
-FILE: rtlwifi/rtl8192cufw_B.bin
-FILE: rtlwifi/rtl8192cufw_TMSC.bin
+File: rtlwifi/rtl8192cufw_A.bin
+File: rtlwifi/rtl8192cufw_B.bin
+File: rtlwifi/rtl8192cufw_TMSC.bin
Licence: Redistributable. See LICENCE.rtlwifi_firmware.txt for details.
@@ -1968,6 +1971,24 @@
--------------------------------------------------------------------------
+Driver: rtl8821ae - Realtek 802.11n WLAN driver for RTL8821AE
+
+Info: Taken from Realtek version wifi_driver_8821ae_0018.1129.2013.tar.gz
+File: rtlwifi/rtl8821aefw.bin
+
+Licence: Redistributable. See LICENCE.rtlwifi_firmware.txt for details.
+
+--------------------------------------------------------------------------
+
+Driver: rtl8192ee - Realtek 802.11n WLAN driver for RTL8192EE
+
+Info: Taken from Realtek version rtl_92ce_92se_92de_8723ae_88ee_8723be_92ee_linux_mac80211_0017.1224.2013
+File: rtlwifi/rtl8192eefw.bin
+
+Licence: Redistributable. See LICENCE.rtlwifi_firmware.txt for details.
+
+--------------------------------------------------------------------------
+
Driver: r8169 - RealTek 8169/8168/8101 ethernet driver.
File: rtl_nic/rtl8168d-1.fw
@@ -2107,7 +2128,11 @@
File: myri10ge_ethp_z8e.dat
File: myri10ge_rss_eth_z8e.dat
File: myri10ge_rss_ethp_z8e.dat
-Version: 1.4.52
+File: myri10ge_eth_big_z8e.dat
+File: myri10ge_ethp_big_z8e.dat
+File: myri10ge_rss_eth_big_z8e.dat
+File: myri10ge_rss_ethp_big_z8e.dat
+Version: 1.4.57
License: Redistributable. See LICENCE.myri10ge_firmware for details.
@@ -2364,11 +2389,11 @@
Driver: BFA/BNA - Brocade Adapter FC/FCOE drivers
File: cbfw-3.2.1.1.bin
-FIle: ctfw-3.2.1.1.bin
-FIle: ct2fw-3.2.1.1.bin
+File: ctfw-3.2.1.1.bin
+File: ct2fw-3.2.1.1.bin
File: cbfw-3.2.3.0.bin
-FIle: ctfw-3.2.3.0.bin
-FIle: ct2fw-3.2.3.0.bin
+File: ctfw-3.2.3.0.bin
+File: ct2fw-3.2.3.0.bin
Licence:
diff --git a/ar3k/AthrBT_0x41020000.dfu b/ar3k/AthrBT_0x41020000.dfu
old mode 100755
new mode 100644
Binary files differ
diff --git a/ar3k/ramps_0x41020000_40.dfu b/ar3k/ramps_0x41020000_40.dfu
old mode 100755
new mode 100644
Binary files differ
diff --git a/ar5523.bin b/ar5523.bin
old mode 100755
new mode 100644
Binary files differ
diff --git a/bnx2x/bnx2x-e1-7.8.19.0.fw b/bnx2x/bnx2x-e1-7.8.19.0.fw
new file mode 100644
index 0000000..fd1fbbb
--- /dev/null
+++ b/bnx2x/bnx2x-e1-7.8.19.0.fw
Binary files differ
diff --git a/bnx2x/bnx2x-e1h-7.8.19.0.fw b/bnx2x/bnx2x-e1h-7.8.19.0.fw
new file mode 100644
index 0000000..7d63337
--- /dev/null
+++ b/bnx2x/bnx2x-e1h-7.8.19.0.fw
Binary files differ
diff --git a/bnx2x/bnx2x-e2-7.8.19.0.fw b/bnx2x/bnx2x-e2-7.8.19.0.fw
new file mode 100644
index 0000000..248e5b7
--- /dev/null
+++ b/bnx2x/bnx2x-e2-7.8.19.0.fw
Binary files differ
diff --git a/brcm/brcmfmac43362-sdio.bin b/brcm/brcmfmac43362-sdio.bin
new file mode 100644
index 0000000..c11dfb2
--- /dev/null
+++ b/brcm/brcmfmac43362-sdio.bin
Binary files differ
diff --git a/carl9170fw/carlfw/src/printf.c b/carl9170fw/carlfw/src/printf.c
old mode 100755
new mode 100644
diff --git a/iwlwifi-3160-8.ucode b/iwlwifi-3160-8.ucode
index 7eee8e6..b5635ef 100644
--- a/iwlwifi-3160-8.ucode
+++ b/iwlwifi-3160-8.ucode
Binary files differ
diff --git a/iwlwifi-7260-8.ucode b/iwlwifi-7260-8.ucode
index 354adeb..c785fc9 100644
--- a/iwlwifi-7260-8.ucode
+++ b/iwlwifi-7260-8.ucode
Binary files differ
diff --git a/mrvl/pcie8897_uapsta.bin b/mrvl/pcie8897_uapsta.bin
index 858c100..6249d45 100644
--- a/mrvl/pcie8897_uapsta.bin
+++ b/mrvl/pcie8897_uapsta.bin
Binary files differ
diff --git a/mrvl/sd8897_uapsta.bin b/mrvl/sd8897_uapsta.bin
index 4866511..3691b1e 100644
--- a/mrvl/sd8897_uapsta.bin
+++ b/mrvl/sd8897_uapsta.bin
Binary files differ
diff --git a/mrvl/usb8897_uapsta.bin b/mrvl/usb8897_uapsta.bin
index 59aef78..7c01ce6 100644
--- a/mrvl/usb8897_uapsta.bin
+++ b/mrvl/usb8897_uapsta.bin
Binary files differ
diff --git a/myri10ge_eth_big_z8e.dat b/myri10ge_eth_big_z8e.dat
new file mode 100644
index 0000000..288030e
--- /dev/null
+++ b/myri10ge_eth_big_z8e.dat
Binary files differ
diff --git a/myri10ge_eth_z8e.dat b/myri10ge_eth_z8e.dat
index 0e6c3db..92f54a3 100644
--- a/myri10ge_eth_z8e.dat
+++ b/myri10ge_eth_z8e.dat
Binary files differ
diff --git a/myri10ge_ethp_big_z8e.dat b/myri10ge_ethp_big_z8e.dat
new file mode 100644
index 0000000..24d122d
--- /dev/null
+++ b/myri10ge_ethp_big_z8e.dat
Binary files differ
diff --git a/myri10ge_ethp_z8e.dat b/myri10ge_ethp_z8e.dat
index 43f49d3..5b462c7 100644
--- a/myri10ge_ethp_z8e.dat
+++ b/myri10ge_ethp_z8e.dat
Binary files differ
diff --git a/myri10ge_rss_eth_big_z8e.dat b/myri10ge_rss_eth_big_z8e.dat
new file mode 100644
index 0000000..588054f
--- /dev/null
+++ b/myri10ge_rss_eth_big_z8e.dat
Binary files differ
diff --git a/myri10ge_rss_eth_z8e.dat b/myri10ge_rss_eth_z8e.dat
index fb2aa74..3011090 100644
--- a/myri10ge_rss_eth_z8e.dat
+++ b/myri10ge_rss_eth_z8e.dat
Binary files differ
diff --git a/myri10ge_rss_ethp_big_z8e.dat b/myri10ge_rss_ethp_big_z8e.dat
new file mode 100644
index 0000000..dce6440
--- /dev/null
+++ b/myri10ge_rss_ethp_big_z8e.dat
Binary files differ
diff --git a/myri10ge_rss_ethp_z8e.dat b/myri10ge_rss_ethp_z8e.dat
index 4617632..15686d3 100644
--- a/myri10ge_rss_ethp_z8e.dat
+++ b/myri10ge_rss_ethp_z8e.dat
Binary files differ
diff --git a/rtlwifi/rtl8192eefw.bin b/rtlwifi/rtl8192eefw.bin
new file mode 100644
index 0000000..bede1ad
--- /dev/null
+++ b/rtlwifi/rtl8192eefw.bin
Binary files differ
diff --git a/rtlwifi/rtl8723fw.bin b/rtlwifi/rtl8723fw.bin
old mode 100755
new mode 100644
Binary files differ
diff --git a/rtlwifi/rtl8723fw_B.bin b/rtlwifi/rtl8723fw_B.bin
old mode 100755
new mode 100644
Binary files differ
diff --git a/rtlwifi/rtl8821aefw.bin b/rtlwifi/rtl8821aefw.bin
new file mode 100644
index 0000000..a863897
--- /dev/null
+++ b/rtlwifi/rtl8821aefw.bin
Binary files differ
diff --git a/ti-connectivity/wl18xx-fw-3.bin b/ti-connectivity/wl18xx-fw-3.bin
new file mode 100644
index 0000000..3c799a3
--- /dev/null
+++ b/ti-connectivity/wl18xx-fw-3.bin
Binary files differ
