[firmware-nonfree] 03/10: libertas: Include Marvell Avastar 88W8997 firmware

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository firmware-nonfree.

commit fd44aaa4ab3818709034cbdfeb9ebedd644ab33e
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Dec 3 18:59:56 2016 +0000

    libertas: Include Marvell Avastar 88W8997 firmware
---
 debian/changelog               |  1 +
 debian/config/libertas/defines | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 00b1d5a..bce4b97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ firmware-nonfree (20161130-1) UNRELEASED; urgency=medium
   * misc-nonfree: Include Intel "Kabylake" DMC firmware and Intel
     "Skylake" GuC firmware version 6.1 (Closes: #838476, #842762)
   * brcm80211: Include Broadcom BCM43430 firmware
+  * libertas: Include Marvell Avastar 88W8997 firmware
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 02 Dec 2016 22:53:26 +0000
 
diff --git a/debian/config/libertas/defines b/debian/config/libertas/defines
index 0e599b4..6d0497d 100644
--- a/debian/config/libertas/defines
+++ b/debian/config/libertas/defines
@@ -27,6 +27,8 @@ files:
  libertas_cs.fw
  libertas_cs_helper.fw
  mrvl/pcie8897_uapsta.bin
+ mrvl/pcieuart8997_combo_v4.bin
+ mrvl/pcieusb8997_combo_v4.bin
  mrvl/sd8688.bin
  mrvl/sd8688_helper.bin
  mrvl/sd8787_uapsta.bin
@@ -54,7 +56,7 @@ files:
  usb8388.bin
 longdesc: wireless network cards with Marvell Libertas 8xxx chips supported
  by the libertas_cs, libertas_sdio, libertas_spi, libertas_tf_usb,
- mwifiex_sdio, mwifiex_usb, mwl8k and usb8xxx drivers
+ mwifiex_pcie, mwifiex_sdio, mwifiex_usb, mwl8k and usb8xxx drivers
 replaces: libertas-firmware
 breaks: libertas-firmware (<< 9.70.7.p0.0-2)
 provides: libertas-firmware
@@ -135,6 +137,14 @@ desc: USB8682 firmware
 desc: PCIE8897 firmware
 version: 15.68.7.p53
 
+[mrvl/pcieuart8997_combo_v4.bin_base]
+desc: Avastar 88W8997-PCIe-UART firmware
+version: 16.68.1.p70
+
+[mrvl/pcieusb8997_combo_v4.bin_base]
+desc: Avastar 88W8997-PCIe-USB firmware
+version: 16.68.1.p70
+
 [mrvl/sd8688.bin_base]
 desc: SD8688 main code
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/firmware-nonfree.git