Move sd8688*.bin images into mrvl/ tree

They are (unlike rest of sd8xxx images from libertas/ and mrvl/) not Libertas
WiFi specific and are used for the bluetooth controller (btmrvl) which does not
look for them in libertas/.

Provide a compatibility symbolic link to avoid breaking libertas_sdio drivers
that are already in use.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>

diff --git a/WHENCE b/WHENCE
index 96142c28d3e1e6d8b9f422bef27970f58661c9e2..50fa0250a90a1e666438195da5d84289400d9965 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -667,11 +667,11 @@ File: libertas/sd8686_v8.bin
 File: libertas/sd8686_v8_helper.bin
 File: libertas/sd8686_v9.bin
 File: libertas/sd8686_v9_helper.bin
-File: libertas/sd8688.bin
-File: libertas/sd8688_helper.bin
 File: libertas/usb8388_v5.bin
 File: libertas/usb8388_v9.bin
 File: libertas/usb8682.bin
+File: mrvl/sd8688.bin
+File: mrvl/sd8688_helper.bin
 
 Licence: Redistributable. See LICENCE.Marvell for details.  Extracted from
 Linux driver tarballs downloaded from Marvell's "Extranet" with permission.

diff --git a/libertas/sd8688.bin b/libertas/sd8688.bin
deleted file mode 100644 (file)
index 199e32adc70916c11be53f4a43bce01a4b5ba899..0000000000000000000000000000000000000000
Binary files a/libertas/sd8688.bin and /dev/null differ

diff --git a/libertas/sd8688.bin b/libertas/sd8688.bin
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..46d817f5f323e07e51bb9ec2c4500166ae942edf
--- /dev/null
+++ b/libertas/sd8688.bin
@@ -0,0 +1 @@
+../mrvl/sd8688.bin
\ No newline at end of file

diff --git a/libertas/sd8688_helper.bin b/libertas/sd8688_helper.bin
deleted file mode 100644 (file)
index 746ae0bfb8edd369d19392b734c8ce8d23b42e3f..0000000000000000000000000000000000000000
Binary files a/libertas/sd8688_helper.bin and /dev/null differ

diff --git a/libertas/sd8688_helper.bin b/libertas/sd8688_helper.bin
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..6515a2c58a8014d0e62f74f8f087d040872288b4
--- /dev/null
+++ b/libertas/sd8688_helper.bin
@@ -0,0 +1 @@
+../mrvl/sd8688_helper.bin
\ No newline at end of file

diff --git a/mrvl/sd8688.bin b/mrvl/sd8688.bin
new file mode 100644 (file)
index 0000000..199e32a
Binary files /dev/null and b/mrvl/sd8688.bin differ

diff --git a/mrvl/sd8688_helper.bin b/mrvl/sd8688_helper.bin
new file mode 100644 (file)
index 0000000..746ae0b
Binary files /dev/null and b/mrvl/sd8688_helper.bin differ