[kernel] r18046 - in dists/trunk/firmware-nonfree: . debian libertas libertas/libertas libertas/mwl8k

[Ben Hutchings]

Author: benh
Date: Mon Sep  5 01:13:26 2011
New Revision: 18046

Log:
Update and enable building of firmware-libertas package

Add more files from linux-firmware as needed by current drivers.

Complete and correct file descriptions.

Update file exclusion list based on current drivers.

Added:
   dists/trunk/firmware-nonfree/libertas/libertas/cf8381.bin   (contents, props changed)
   dists/trunk/firmware-nonfree/libertas/libertas/cf8381_helper.bin   (contents, props changed)
   dists/trunk/firmware-nonfree/libertas/mwl8k/fmimage_8366.fw   (contents, props changed)
   dists/trunk/firmware-nonfree/libertas/mwl8k/fmimage_8366_ap-2.fw   (contents, props changed)
   dists/trunk/firmware-nonfree/libertas/mwl8k/helper_8366.fw   (contents, props changed)
Modified:
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/defines
   dists/trunk/firmware-nonfree/libertas/defines

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	Sun Sep  4 23:30:50 2011	(r18045)
+++ dists/trunk/firmware-nonfree/debian/changelog	Mon Sep  5 01:13:26 2011	(r18046)
@@ -1,3 +1,10 @@
+firmware-nonfree (0.34) UNRELEASED; urgency=low
+
+  * Add Marvell Libertas 8xxx firmware, replacing libertas-firmware package
+    (Closes: #609856)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 05 Sep 2011 01:50:01 +0100
+
 firmware-nonfree (0.33) unstable; urgency=low
 
   * Update to linux-support-3.0.0-1

Modified: dists/trunk/firmware-nonfree/defines
==============================================================================
--- dists/trunk/firmware-nonfree/defines	Sun Sep  4 23:30:50 2011	(r18045)
+++ dists/trunk/firmware-nonfree/defines	Mon Sep  5 01:13:26 2011	(r18046)
@@ -8,7 +8,7 @@
  ipw2x00
  ivtv
  iwlwifi
-# libertas
+ libertas
  linux-nonfree
  myricom
  netxen
@@ -33,9 +33,12 @@
  bnx2x-e1*-5.2.13.0.fw
 # No Debian release references these versions
  cxgb3/t3fw-7.[01].0.bin
-# Currently (should be) packaged in libertas-firmware
- libertas/*
- mwl8k/*
+# No Debian release references these versions
+ libertas/gspi8682*.bin
+ libertas/lbtf_*.bin
+ libertas/sd8682*.bin
+ libertas/usb8388_olpc.bin
  mrvl/sd8787_uapsta.bin
+ mwl8k/fmimage_8366_ap-1.fw
 # Xframe hardware has been discontinued and no-one requested these
  vxge/X3fw*.ncf

Modified: dists/trunk/firmware-nonfree/libertas/defines
==============================================================================
--- dists/trunk/firmware-nonfree/libertas/defines	Sun Sep  4 23:30:50 2011	(r18045)
+++ dists/trunk/firmware-nonfree/libertas/defines	Mon Sep  5 01:13:26 2011	(r18046)
@@ -1,6 +1,8 @@
 [base]
 desc: Marvell Libertas 8xxx wireless cards
 files:
+ libertas/cf8381.bin
+ libertas/cf8381_helper.bin
  libertas/cf8385.bin
  libertas/cf8385_helper.bin
  libertas/gspi8686.bin
@@ -22,7 +24,10 @@
  libertas/usb8682.bin
  libertas_cs.fw
  libertas_cs_helper.fw
+ mwl8k/fmimage_8366.fw
+ mwl8k/fmimage_8366_ap-2.fw
  mwl8k/fmimage_8687.fw
+ mwl8k/helper_8366.fw
  mwl8k/helper_8687.fw
  sd8385.bin
  sd8385_helper.bin
@@ -31,12 +36,16 @@
  sd8688.bin
  sd8688_helper.bin
  usb8388.bin
-longdesc: wireless network cards with the Marvell Libertas CF8385,
- GSPI8686, GSPI8688, MWL8687, SD8385, SD8686, SD8688, USB8388 and USB8682
- chips, supported by the libertas_cs, libertas_sdio, libertas_spi, mwl8k
- and usb8xxx drivers
+longdesc: wireless network cards with Marvell Libertas 8xxx chips supported
+ by the libertas_cs, libertas_sdio, libertas_spi, mwl8k and usb8xxx drivers
 uri: http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git
 
+[libertas/cf8381.bin_base]
+desc: CF8381 main code
+
+[libertas/cf8381_helper.bin_base]
+desc: CF8381 boot code
+
 [libertas/cf8385.bin_base]
 desc: CF8385 main code
 
@@ -85,6 +94,34 @@
 [libertas/sd8688_helper.bin_base]
 desc: SD8688 boot code
 
+[libertas/sd8385.bin_base]
+desc: SD8385 main code
+
+[libertas/sd8385_helper.bin_base]
+desc: SD8385 boot code
+
+[libertas/sd8686_v8.bin_base]
+desc: SD8686 main code
+version: 8.x
+
+[libertas/sd8686_v8_helper.bin_base]
+desc: SD8686 boot code
+version: 8.x
+
+[libertas/sd8686_v9.bin_base]
+desc: SD8686 main code
+version: 9.x
+
+[libertas/sd8686_v9_helper.bin_base]
+desc: SD8686 boot code
+version: 9.x
+
+[libertas/sd8688.bin_base]
+desc: SD8688 main code
+
+[libertas/sd8688_helper.bin_base]
+desc: SD8688 boot code
+
 [libertas/usb8388_v5.bin_base]
 desc: USB8388 firmware
 version: 5.x
@@ -96,8 +133,17 @@
 [libertas/usb8682.bin_base]
 desc: USB8682 firmware
 
-[mwl8k/fmimage_8687.fw]
+[mwl8k/fmimage_8366.fw_base]
+desc: MWL8366 main code
+
+[mwl8k/fmimage_8366_ap-2.fw_base]
+desc: MWL8366 AP-mode main code
+
+[mwl8k/fmimage_8687.fw_base]
 desc: MWL8687 main code
 
-[mwl8k/helper_8687.fw]
+[mwl8k/helper_8366.fw_base]
+desc: MWL8366 boot code
+
+[mwl8k/helper_8687.fw_base]
 desc: MWL8687 boot code

Added: dists/trunk/firmware-nonfree/libertas/libertas/cf8381.bin
==============================================================================
Binary file. No diff available.

Added: dists/trunk/firmware-nonfree/libertas/libertas/cf8381_helper.bin
==============================================================================
Binary file. No diff available.

Added: dists/trunk/firmware-nonfree/libertas/mwl8k/fmimage_8366.fw
==============================================================================
Binary file. No diff available.

Added: dists/trunk/firmware-nonfree/libertas/mwl8k/fmimage_8366_ap-2.fw
==============================================================================
Binary file. No diff available.

Added: dists/trunk/firmware-nonfree/libertas/mwl8k/helper_8366.fw
==============================================================================
Binary file. No diff available.