rt2870sta: Use latest firmware for RT3070 and RT3071

Ralink's original drivers for RT2800U-family chips used multiple
different versions of the firmware for different chips.  The rt2870sta
driver in staging was briefly converted to load different files for
different chips.  However, the current rt2870.bin provides 2 images
that are supposed to cover all of them, so:

- Replace rt3070.bin with a symlink.  The driver will use the first
  image and ignore the second.
- Replace rt3071.bin with a copy of the second image in the current
  rt2870.bin.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/WHENCE b/WHENCE
index e28b0cce53b0c78b8c6567c3c20f30687b3fb00b..f005c0f38d136c3bf489d8226615abea576afd55 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -1120,12 +1120,22 @@ This is a link to rt2860.bin for compatibility.
 Driver: rt2800usb - Ralink RT2870, RT3070, RT3071, RT3072, RT5370 wireless MACs
 
 File: rt2870.bin
+
+Licence: Redistributable. See LICENCE.ralink-firmware.txt for details
+
+Binary file supplied by Shiang Tu <shiang_tu@ralinktech.com>. Firmware Version 29
+
+--------------------------------------------------------------------------
+
+Driver: rt2870sta - Ralink RT2870, RT3070, RT3071 wireless MACs
+
 File: rt3070.bin
 File: rt3071.bin
 
 Licence: Redistributable. See LICENCE.ralink-firmware.txt for details
 
-Binary file supplied by Shiang Tu <shiang_tu@ralinktech.com>. Firmware Version 29
+rt3070.bin is a link to rt2870.bin for compatibility.
+rt3071.bin is a copy of bytes 4096-8191 of rt2870.bin for compatibility.
 
 --------------------------------------------------------------------------
 

diff --git a/rt3070.bin b/rt3070.bin
deleted file mode 100644 (file)
index cd49e9601489592323d63bfe309dc8c0d18564b7..0000000000000000000000000000000000000000
Binary files a/rt3070.bin and /dev/null differ

diff --git a/rt3070.bin b/rt3070.bin
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..d233a1d537fc029635af7300271cabc8120e60f0
--- /dev/null
+++ b/rt3070.bin
@@ -0,0 +1 @@
+rt2870.bin
\ No newline at end of file

diff --git a/rt3071.bin b/rt3071.bin
index 6db66b3bc3ba367bee086e09adf314982abba71d..b1f44e0207aef4728ec0d401a499512f048a0b7b 100644 (file)
Binary files a/rt3071.bin and b/rt3071.bin differ