[kernel] r20041 - in dists/trunk/firmware-nonfree: debian libertas libertas/libertas libertas/mrvl

[Ben Hutchings]

Author: benh
Date: Mon May  6 03:53:19 2013
New Revision: 20041

Log:
libertas: Move libertas/sd8688{,_helper}.bin into mrvl/ and add symlinks

These are not really specific to Libertas hardware.  The btmrvl driver
expects them to be in mrvl/ and libertas_sdio will also do so in future.

Added:
   dists/trunk/firmware-nonfree/libertas/mrvl/
   dists/trunk/firmware-nonfree/libertas/mrvl/sd8688.bin
      - copied unchanged from r20038, dists/trunk/firmware-nonfree/libertas/libertas/sd8688.bin
   dists/trunk/firmware-nonfree/libertas/mrvl/sd8688_helper.bin
      - copied unchanged from r20038, dists/trunk/firmware-nonfree/libertas/libertas/sd8688_helper.bin
Replaced:
   dists/trunk/firmware-nonfree/libertas/libertas/sd8688.bin   (contents, props changed)
   dists/trunk/firmware-nonfree/libertas/libertas/sd8688_helper.bin   (contents, props changed)
Modified:
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/libertas/defines
   dists/trunk/firmware-nonfree/libertas/sd8688.bin
   dists/trunk/firmware-nonfree/libertas/sd8688_helper.bin

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	Mon May  6 03:29:30 2013	(r20040)
+++ dists/trunk/firmware-nonfree/debian/changelog	Mon May  6 03:53:19 2013	(r20041)
@@ -9,6 +9,8 @@
   * Update to linux-support-3.8-1
   * realtek: Update copyright information for PHY firmware used with r8169
     (Closes: #706912)
+  * libertas: Move libertas/sd8688{,_helper}.bin into mrvl/ and add symlinks,
+    for compatibility with both btmrvl and libertas_sdio drivers
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 06 Jan 2013 18:19:39 +0000
 

Modified: dists/trunk/firmware-nonfree/libertas/defines
==============================================================================
--- dists/trunk/firmware-nonfree/libertas/defines	Mon May  6 03:29:30 2013	(r20040)
+++ dists/trunk/firmware-nonfree/libertas/defines	Mon May  6 03:53:19 2013	(r20041)
@@ -26,6 +26,8 @@
  libertas/usb8682.bin
  libertas_cs.fw
  libertas_cs_helper.fw
+ mrvl/sd8688.bin
+ mrvl/sd8688_helper.bin
  mwl8k/fmimage_8366.fw
  mwl8k/fmimage_8366_ap-2.fw
  mwl8k/fmimage_8687.fw
@@ -125,12 +127,6 @@
 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_olpc.bin_base]
 desc: USB8388 OLPC firmware
 version: 5.110.22.p23
@@ -146,6 +142,12 @@
 [libertas/usb8682.bin_base]
 desc: USB8682 firmware
 
+[mrvl/sd8688.bin_base]
+desc: SD8688 main code
+
+[mrvl/sd8688_helper.bin_base]
+desc: SD8688 boot code
+
 [mwl8k/fmimage_8366.fw_base]
 desc: MWL8366 main code
 

Added: dists/trunk/firmware-nonfree/libertas/libertas/sd8688.bin
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/firmware-nonfree/libertas/libertas/sd8688.bin	Mon May  6 03:53:19 2013	(r20041)
@@ -0,0 +1 @@
+link ../mrvl/sd8688.bin
\ No newline at end of file

Added: dists/trunk/firmware-nonfree/libertas/libertas/sd8688_helper.bin
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/firmware-nonfree/libertas/libertas/sd8688_helper.bin	Mon May  6 03:53:19 2013	(r20041)
@@ -0,0 +1 @@
+link ../mrvl/sd8688_helper.bin
\ No newline at end of file

Copied: dists/trunk/firmware-nonfree/libertas/mrvl/sd8688.bin (from r20038, dists/trunk/firmware-nonfree/libertas/libertas/sd8688.bin)
==============================================================================
Binary file (source and/or target). No diff available.

Copied: dists/trunk/firmware-nonfree/libertas/mrvl/sd8688_helper.bin (from r20038, dists/trunk/firmware-nonfree/libertas/libertas/sd8688_helper.bin)
==============================================================================
Binary file (source and/or target). No diff available.

Modified: dists/trunk/firmware-nonfree/libertas/sd8688.bin
==============================================================================
--- dists/trunk/firmware-nonfree/libertas/sd8688.bin	Mon May  6 03:29:30 2013	(r20040)
+++ dists/trunk/firmware-nonfree/libertas/sd8688.bin	Mon May  6 03:53:19 2013	(r20041)
@@ -1 +1 @@
-link libertas/sd8688.bin
\ No newline at end of file
+link mrvl/sd8688.bin
\ No newline at end of file

Modified: dists/trunk/firmware-nonfree/libertas/sd8688_helper.bin
==============================================================================
--- dists/trunk/firmware-nonfree/libertas/sd8688_helper.bin	Mon May  6 03:29:30 2013	(r20040)
+++ dists/trunk/firmware-nonfree/libertas/sd8688_helper.bin	Mon May  6 03:53:19 2013	(r20041)
@@ -1 +1 @@
-link libertas/sd8688_helper.bin
\ No newline at end of file
+link mrvl/sd8688_helper.bin
\ No newline at end of file