Re: [PATCH] ti-connectivity: add wl1251 firmware and license

[Felipe Balbi]

Hi,

On Wed, Sep 25, 2013 at 02:07:58PM +0300, Luca Coelho wrote:
> On Wed, 2013-09-25 at 14:04 +0300, Luca Coelho wrote:
> > Hi dude,
> > 
> > Great, this is cool! Finally! :)
> > 
> > A few comments...
> > 
> > 
> > On Tue, 2013-09-24 at 09:44 -0500, Felipe Balbi wrote:
> > > It's way overdue that we send these firmware
> > > blobs upstream. Thanks for everybody involved
> > > in getting this sorted out.
> > > 
> > > Cc: Luciano Coelho <luca@xxxxxxxxx>
> > > Cc: Pavel Machek <pavel@xxxxxxx>
> > > Signed-off-by: Felipe Balbi <balbi@xxxxxx>
> > > ---
> > 
> > The commit message could be a bit more descriptive rather than
> > narrative?
> > 
> > 
> > >  ti-connectivity/license-wl1251.txt |  59 +++++++++++++++++++++++++++++++++++++
> > 
> > The license file should be in the root, together with the other licenses
> > and called LICENCE.wl1251 (note the en-GB spelling).  Also, this license
> > is *very* similar to the one for WiLink6/7/8 (LICENCE.ti-connectivity),
> > except for some very minor things and the formatting.  Couldn't the same
> > one be used, for the sake of simplicity and consistency?
> > 
> > 
> > >  ti-connectivity/wl1251-fw.bin      | Bin 0 -> 194180 bytes
> > >  ti-connectivity/wl1251-nvs.bin     | Bin 0 -> 752 bytes
> > >  3 files changed, 59 insertions(+)
> > >  create mode 100644 ti-connectivity/license-wl1251.txt
> > >  create mode 100644 ti-connectivity/wl1251-fw.bin
> > >  create mode 100644 ti-connectivity/wl1251-nvs.bin
> > 
> > When sending big binary blobs, it's generally better to send pull
> > requests instead of patches.  If you add the -p option when calling git
> > pull-request, the text will include all the readable parts but will omit
> > the binary stuff.
> > 
> > Thank you very much for following up on this!
> 
> Ah, and I forgot to say that you should update the WHENCE file
> accordingly too.  Check the wl12xx and wl18xx drivers for examples.

I'll send a pull request, but how about this ? I don't think we can
change the license. It seems like the other firmwares are using the
older license, I'd argue those should be changed to the new one, but
that's another discussion.

commit 453b2a32470b2e50c5c96bc7ac4a39a3f6b6b30d
Author: Felipe Balbi <balbi@xxxxxx>
Date:   Tue Sep 24 09:29:34 2013 -0500

    ti-connectivity: add wl1251 firmware and license
    
    This new firmware blob is used with the old wl1251
    device whose driver has been in the kernel for quite
    some time.
    
    Cc: Luciano Coelho <luca@xxxxxxxxx>
    Cc: Pavel Machek <pavel@xxxxxxx>
    Signed-off-by: Felipe Balbi <balbi@xxxxxx>

diff --git a/LICENCE.wl1251 b/LICENCE.wl1251
new file mode 100644
index 0000000..bd0f5f1
--- /dev/null
+++ b/LICENCE.wl1251
@@ -0,0 +1,59 @@
+Copyright (c) 2000 â 2013 Texas Instruments Incorporated
+
+All rights reserved not granted herein.
+
+Limited License.
+
+Texas Instruments Incorporated grants a world-wide, royalty-free, non-exclusive
+license under copyrights and patents it now or hereafter owns or controls to
+make, have made, use, import, offer to sell and sell ("Utilize") this software
+subject to the terms herein.  With respect to the foregoing patent license,
+such license is granted  solely to the extent that any such patent is necessary
+to Utilize the software alone.  The patent license shall not apply to any
+combinations which include this software, other than combinations with devices
+manufactured by or for TI (âTI Devicesâ).  No hardware patent is licensed
+hereunder.
+
+Redistributions must preserve existing copyright notices and reproduce this
+license (including the above copyright notice and the disclaimer and (if
+applicable) source code license limitations below) in the documentation and/or
+other materials provided with the distribution
+
+Redistribution and use in binary form, without modification, are permitted
+provided that the following conditions are met:
+
+*	No reverse engineering, decompilation, or disassembly of this software
+	is permitted with respect to any software provided in binary form.
+
+*	any redistribution and use are licensed by TI for use only with TI
+	Devices.
+
+*	Nothing shall obligate TI to provide you with source code for the
+	software licensed and provided to you in object code.
+
+If software source code is provided to you, modification and redistribution of
+the source code are permitted provided that the following conditions are met:
+
+*	any redistribution and use of the source code, including any resulting
+	derivative works, are licensed by TI for use only with TI Devices.
+
+*	any redistribution and use of any object code compiled from the source
+	code and any resulting derivative works, are licensed by TI for use
+	only with TI Devices.
+
+Neither the name of Texas Instruments Incorporated nor the names of its
+suppliers may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+DISCLAIMER.
+
+THIS SOFTWARE IS PROVIDED BY TI AND TIâS LICENSORS "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL TI AND TIâS LICENSORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/WHENCE b/WHENCE
index e66fea5..4e9e2ed 100644
--- a/WHENCE
+++ b/WHENCE
@@ -1705,6 +1705,19 @@ Licence: Redistributable. See LICENCE.tda7706-firmware.txt for details.
 
 --------------------------------------------------------------------------
 
+Driver: wl1251 - Texas Instruments 802.11 WLAN driver for WiLink4 chips
+
+File: ti-connectivity/wl1251-fw.bin
+File: ti-connectivity/wl1251-nvs.bin
+
+Licence: See LICENCE.wl1251 for details.
+
+The driver expects to find the firmwares under a ti-connectivity subdirectory.
+So if your system looks for firmwares in /lib/firmware, the firmwares for
+wl12xx chips must be located in /lib/firmware/ti-connectivity/.
+
+--------------------------------------------------------------------------
+
 Driver: wl12xx - Texas Instruments 802.11 WLAN driver for WiLink6/7 chips
 
 File: ti-connectivity/wl1271-fw.bin
diff --git a/ti-connectivity/wl1251-fw.bin b/ti-connectivity/wl1251-fw.bin
new file mode 100644
index 0000000..f89c983
Binary files /dev/null and b/ti-connectivity/wl1251-fw.bin differ
diff --git a/ti-connectivity/wl1251-nvs.bin b/ti-connectivity/wl1251-nvs.bin
new file mode 100644
index 0000000..2bf9c50
Binary files /dev/null and b/ti-connectivity/wl1251-nvs.bin differ

-- 
balbi

Attachment: signature.asc
Description: Digital signature