[kernel] r18063 - in dists/trunk/firmware-nonfree: . libertas libertas/libertas

[Ben Hutchings]

Author: benh
Date: Thu Sep  8 14:48:59 2011
New Revision: 18063

Log:
Add two more Marvell Libertas firmware images

Added:
   dists/trunk/firmware-nonfree/libertas/lbtf_usb.bin   (contents, props changed)
   dists/trunk/firmware-nonfree/libertas/libertas/usb8388_olpc.bin   (contents, props changed)
Modified:
   dists/trunk/firmware-nonfree/defines
   dists/trunk/firmware-nonfree/libertas/defines

Modified: dists/trunk/firmware-nonfree/defines
==============================================================================
--- dists/trunk/firmware-nonfree/defines	Thu Sep  8 14:40:22 2011	(r18062)
+++ dists/trunk/firmware-nonfree/defines	Thu Sep  8 14:48:59 2011	(r18063)
@@ -35,9 +35,7 @@
  cxgb3/t3fw-7.[01].0.bin
 # 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

Modified: dists/trunk/firmware-nonfree/libertas/defines
==============================================================================
--- dists/trunk/firmware-nonfree/libertas/defines	Thu Sep  8 14:40:22 2011	(r18062)
+++ dists/trunk/firmware-nonfree/libertas/defines	Thu Sep  8 14:48:59 2011	(r18063)
@@ -1,6 +1,7 @@
 [base]
 desc: Marvell Libertas 8xxx wireless cards
 files:
+ lbtf_usb.bin
  libertas/cf8381.bin
  libertas/cf8381_helper.bin
  libertas/cf8385.bin
@@ -19,6 +20,7 @@
  libertas/sd8686_v9_helper.bin
  libertas/sd8688.bin
  libertas/sd8688_helper.bin
+ libertas/usb8388_olpc.bin
  libertas/usb8388_v5.bin
  libertas/usb8388_v9.bin
  libertas/usb8682.bin
@@ -37,12 +39,16 @@
  sd8688_helper.bin
  usb8388.bin
 longdesc: wireless network cards with Marvell Libertas 8xxx chips supported
- by the libertas_cs, libertas_sdio, libertas_spi, mwl8k and usb8xxx drivers
+ by the libertas_cs, libertas_sdio, libertas_spi, libertas_tf_usb, mwl8k and
+ usb8xxx drivers
 uri: http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
 replaces: libertas-firmware
 conflicts: libertas-firmware
 provides: libertas-firmware
 
+[lbtf_usb.bin_base]
+desc: USB8388 'Thinfirm' firmware
+
 [libertas/cf8381.bin_base]
 desc: CF8381 main code
 
@@ -125,6 +131,10 @@
 [libertas/sd8688_helper.bin_base]
 desc: SD8688 boot code
 
+[libertas/usb8388_olpc.bin_base]
+desc: USB8388 OLPC firmware
+version: 5.110.22.p23
+
 [libertas/usb8388_v5.bin_base]
 desc: USB8388 firmware
 version: 5.x

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

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