Merge lp:~hui.wang/ubuntu/vivid/linux-firmware/linux-firmware-vivid-proposed into lp:ubuntu/vivid/linux-firmware

[Hui Wang]

backport firmware for braodcom wifi card bcm4356. It is tested on two lenovo machines with bcm4356 on it. No need to modify driver, just need to add this firmware file to vivid.

[Seth Forshee (sforshee)]

Disapproving since we don't use bzr to manage linux-firmware. The relevant changes have been added to our git repo.

review: Disapprove

Unmerged revisions

134. By Hui Wang on 2015-11-19

Backport Broadcom 4356 Wifi firmware, satisfied by the following upstream commits:
brcm: add firmware for BCM4356 PCIe device (64444e07)
brcm: update firmware for the BCM4356 PCIe device (3bb141ac)
-LP: #1517726

133. By Seth Forshee on 2015-09-24

Update i915 Skylake firmware to upstream versions
linux-firmware: New minor DMC release for Skylakever1_20
linux-firmware: New minor DMC release for Skylakever1_21
linux-firmware: Clean up i915 by removing old skl dmc firmware.
-LP: #1497070

132. By Seth Forshee on 2015-08-03

* Backport Intel 8260 Wifi/BT firmware, satisfied by the following
  upstream commits:
  iwlwifi: add new -13 firmware for iwlmvm devices
  linux-firmware: Add firmware file for Intel Bluetooth 8260
  - LP: #1476900

131. By Seth Forshee on 2015-07-10

[ Rodrigo Vivi ]

Add firmware files for i915 Skylake graphics:
cherry picked from git://people.freedesktop.org/~vivijim/linux-firmware-i915
linux-firmware: Add i915 DMC firmware
linux-firmware: New minor DMC release for Skylake.
linux-firmware: New minor DMC release for Skylakever1_18
linux-firmware: New minor DMC release for Skylakever1_19
-LP: #1441861

130. By Seth Forshee on 2015-05-11

iwlwifi: update -12.ucode for 3160 / 7260 / 7265 / 7265D
-LP: #1453935

=== modified file 'LICENCE.iwlwifi_firmware'
--- LICENCE.iwlwifi_firmware	2014-04-30 13:49:24 +0000
+++ LICENCE.iwlwifi_firmware	2015-11-19 08:26:35 +0000
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2014, Intel Corporation.
+Copyright (c) 2006-2015, Intel Corporation.
 All rights reserved.
 
 Redistribution.  Redistribution and use in binary form, without

=== added file 'LICENSE.i915'
--- LICENSE.i915	1970-01-01 00:00:00 +0000
+++ LICENSE.i915	2015-11-19 08:26:35 +0000
@@ -0,0 +1,39 @@
+Copyright (c) 2015, Intel Corporation.
+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 Intel Corporation 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.  Intel Corporation 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.

=== modified file 'WHENCE'
--- WHENCE	2015-03-04 00:16:58 +0000
+++ WHENCE	2015-11-19 08:26:35 +0000
@@ -828,7 +828,10 @@
 Version: 23.14.10.0
 
 File: iwlwifi-7260-12.ucode
-Version: 25.15.12.0
+Version: 25.17.12.0
+
+File: iwlwifi-7260-13.ucode
+Version: 25.30.13.0
 
 File: iwlwifi-3160-7.ucode
 Version: 22.1.7.0
@@ -843,7 +846,10 @@
 Version: 23.14.10.0
 
 File: iwlwifi-3160-12.ucode
-Version: 25.15.12.0
+Version: 25.17.12.0
+
+File: iwlwifi-3160-13.ucode
+Version: 25.30.13.0
 
 File: iwlwifi-7265-8.ucode
 Version: 22.24.8.0
@@ -855,13 +861,22 @@
 Version: 23.14.10.0
 
 File: iwlwifi-7265-12.ucode
-Version: 25.15.12.0
+Version: 25.17.12.0
+
+File: iwlwifi-7265-13.ucode
+Version: 25.30.13.0
 
 File: iwlwifi-7265D-10.ucode
 Version: 23.14.10.0
 
 File: iwlwifi-7265D-12.ucode
-Version: 25.15.12.0
+Version: 25.17.12.0
+
+File: iwlwifi-7265D-13.ucode
+Version: 25.30.13.0
+
+File: iwlwifi-8000C-13.ucode
+Version: 25.30.13.0
 
 Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
 
@@ -1867,6 +1882,7 @@
 File: brcm/brcmfmac43143.bin
 File: brcm/brcmfmac43143-sdio.bin
 File: brcm/brcmfmac4354-sdio.bin
+File: brcm/brcmfmac4356-pcie.bin
 
 Licence: Redistributable. See LICENCE.broadcom_bcm43xx for details.
 
@@ -2443,6 +2459,10 @@
 Version: STP2_C0_1339_02_patch_40.1
 File: intel/ibt-hw-37.8.10-fw-1.10.3.11.e.bseq
 Version: STP2_D0_1417_04_patch_09.1
+File: intel/ibt-11-5.ddc
+Version: LnP/SfP_REL0190
+File: intel/ibt-11-5.sfi
+Version: LnP/SfP_REL0190
 
 Licence: Redistributable. See LICENCE.ibt_firmware for details
 
@@ -2669,3 +2689,16 @@
 File: intel/fw_sst_22a8.bin
 
 License: Redistributable. See LICENCE.fw_sst_0f28 for details
+
+--------------------------------------------------------------------------
+
+Driver: i915 -- Intel Integrated Graphics driver
+
+File: i915/skl_dmc_ver1_19.bin
+File: i915/skl_dmc_ver1_20.bin
+File: i915/skl_dmc_ver1_21.bin
+
+File: i915/skl_dmc_ver1.bin
+Version: DMC API/ABI ver 1 - release 21 for Skylake
+
+License: Redistributable. See LICENSE.i915 for details

=== added file 'brcm/brcmfmac4356-pcie.bin'
Binary files brcm/brcmfmac4356-pcie.bin	1970-01-01 00:00:00 +0000 and brcm/brcmfmac4356-pcie.bin	2015-11-19 08:26:35 +0000 differ
=== modified file 'debian/changelog'
--- debian/changelog	2015-03-04 00:16:58 +0000
+++ debian/changelog	2015-11-19 08:26:35 +0000
@@ -1,3 +1,44 @@
+linux-firmware (1.143.4) vivid; urgency=medium
+
+  * Update i915 Skylake firmware to upstream versions
+    linux-firmware: New minor DMC release for Skylake - ver1_20
+    linux-firmware: New minor DMC release for Skylake - ver1_21
+    linux-firmware: Clean up i915 by removing old skl dmc firmware.
+    -LP: #1497070
+
+ -- Seth Forshee <[e-mail]>  Thu, 24 Sep 2015 08:16:07 -0500
+
+linux-firmware (1.143.3) vivid; urgency=medium
+
+  * Backport Intel 8260 Wifi/BT firmware, satisfied by the following
+    upstream commits:
+    iwlwifi: add new -13 firmware for iwlmvm devices
+    linux-firmware: Add firmware file for Intel Bluetooth 8260
+    - LP: #1476900
+
+ -- Seth Forshee <[e-mail]>  Mon, 03 Aug 2015 08:15:06 -0500
+
+linux-firmware (1.143.2) vivid; urgency=medium
+
+  [ Rodrigo Vivi ]
+
+  * Add firmware files for i915 Skylake graphics:
+    cherry picked from git://people.freedesktop.org/~vivijim/linux-firmware-i915
+    linux-firmware: Add i915 DMC firmware
+    linux-firmware: New minor DMC release for Skylake.
+    linux-firmware: New minor DMC release for Skylake - ver1_18
+    linux-firmware: New minor DMC release for Skylake - ver1_19
+    -LP: #1441861
+
+ -- Seth Forshee <[e-mail]>  Fri, 10 Jul 2015 08:18:29 -0500
+
+linux-firmware (1.143.1) vivid; urgency=medium
+
+  * iwlwifi: update -12.ucode for 3160 / 7260 / 7265 / 7265D
+    -LP: #1453935
+
+ -- Seth Forshee <[e-mail]>  Mon, 11 May 2015 14:41:22 -0500
+
 linux-firmware (1.143) vivid; urgency=medium
 
   * Rebase against git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git cef33368c4d3425f11306496f0250f8ef1cf3c1f

=== added directory 'i915'
=== added symlink 'i915/skl_dmc_ver1.bin'
=== target is u'skl_dmc_ver1_21.bin'
=== added file 'i915/skl_dmc_ver1_19.bin'
Binary files i915/skl_dmc_ver1_19.bin	1970-01-01 00:00:00 +0000 and i915/skl_dmc_ver1_19.bin	2015-11-19 08:26:35 +0000 differ
=== added file 'i915/skl_dmc_ver1_20.bin'
Binary files i915/skl_dmc_ver1_20.bin	1970-01-01 00:00:00 +0000 and i915/skl_dmc_ver1_20.bin	2015-11-19 08:26:35 +0000 differ
=== added file 'i915/skl_dmc_ver1_21.bin'
Binary files i915/skl_dmc_ver1_21.bin	1970-01-01 00:00:00 +0000 and i915/skl_dmc_ver1_21.bin	2015-11-19 08:26:35 +0000 differ
=== added file 'intel/ibt-11-5.ddc'
--- intel/ibt-11-5.ddc	1970-01-01 00:00:00 +0000
+++ intel/ibt-11-5.ddc	2015-11-19 08:26:35 +0000
@@ -0,0 +1,1 @@
+(
B
E‚
\ No newline at end of file

=== added file 'intel/ibt-11-5.sfi'
Binary files intel/ibt-11-5.sfi	1970-01-01 00:00:00 +0000 and intel/ibt-11-5.sfi	2015-11-19 08:26:35 +0000 differ
=== modified file 'iwlwifi-3160-12.ucode'
Binary files iwlwifi-3160-12.ucode	2015-03-04 00:16:58 +0000 and iwlwifi-3160-12.ucode	2015-11-19 08:26:35 +0000 differ
=== added file 'iwlwifi-3160-13.ucode'
Binary files iwlwifi-3160-13.ucode	1970-01-01 00:00:00 +0000 and iwlwifi-3160-13.ucode	2015-11-19 08:26:35 +0000 differ
=== modified file 'iwlwifi-7260-12.ucode'
Binary files iwlwifi-7260-12.ucode	2015-03-04 00:16:58 +0000 and iwlwifi-7260-12.ucode	2015-11-19 08:26:35 +0000 differ
=== added file 'iwlwifi-7260-13.ucode'
Binary files iwlwifi-7260-13.ucode	1970-01-01 00:00:00 +0000 and iwlwifi-7260-13.ucode	2015-11-19 08:26:35 +0000 differ
=== modified file 'iwlwifi-7265-12.ucode'
Binary files iwlwifi-7265-12.ucode	2015-03-04 00:16:58 +0000 and iwlwifi-7265-12.ucode	2015-11-19 08:26:35 +0000 differ
=== added file 'iwlwifi-7265-13.ucode'
Binary files iwlwifi-7265-13.ucode	1970-01-01 00:00:00 +0000 and iwlwifi-7265-13.ucode	2015-11-19 08:26:35 +0000 differ
=== modified file 'iwlwifi-7265D-12.ucode'
Binary files iwlwifi-7265D-12.ucode	2015-03-04 00:16:58 +0000 and iwlwifi-7265D-12.ucode	2015-11-19 08:26:35 +0000 differ
=== added file 'iwlwifi-7265D-13.ucode'
Binary files iwlwifi-7265D-13.ucode	1970-01-01 00:00:00 +0000 and iwlwifi-7265D-13.ucode	2015-11-19 08:26:35 +0000 differ
=== added file 'iwlwifi-8000C-13.ucode'
Binary files iwlwifi-8000C-13.ucode	1970-01-01 00:00:00 +0000 and iwlwifi-8000C-13.ucode	2015-11-19 08:26:35 +0000 differ