Skip to contentSkip to conversation

ti-connectivity: add wl1251 firmware and license

PATCH In review Felipe Balbi 3 participants 14 messages Sep 24, 2013 – Oct 13, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ti-connectivity: add wl1251 firmware and license

It's way overdue that we send these firmware
blobs upstream. Thanks for everybody involved
in getting this sorted out.

Cc Luciano Coelho <[email protected]>
Cc Pavel Machek <[email protected]>
---
 ti-connectivity/license-wl1251.txt |  59 +++++++++++++++++++++++++++++++++++++
 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
ti-connectivity/license-wl1251.txt new file +59 -0
new file mode 100644
index 0000000..bd0f5f1
@@ -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.
ti-connectivity/wl1251-fw.bin new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..f89c98354cab391e7003ffe4c6841215ab7bef76
GIT binary patch
ti-connectivity/wl1251-nvs.bin new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..2bf9c50b24d9306cb9a811018838fe265d27bd8e
GIT binary patch
Signature · 1 line
1.8.3.4.840.g6a90778
#1 lore raw

Hi dude,

Great, this is cool! Finally! :)

A few comments...

Quoted 8 lines · Felipe Balbi

It's way overdue that we send these firmware blobs upstream. Thanks for everybody involved in getting this sorted out.

Cc Luciano Coelho <[email protected]>
Cc Pavel Machek <[email protected]>

---

The commit message could be a bit more descriptive rather than narrative?

Quoted 1 line
 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?

Quoted 6 lines
 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!

--
Cheers,
Luca.

#2 lore raw
Quoted 37 lines · Luca Coelho

Hi dude,

Great, this is cool! Finally! :)

A few comments...

Quoted 8 lines · Felipe Balbi

It's way overdue that we send these firmware blobs upstream. Thanks for everybody involved in getting this sorted out.

Cc Luciano Coelho <[email protected]>
Cc Pavel Machek <[email protected]>

---

The commit message could be a bit more descriptive rather than narrative?

Quoted 1 line
 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?

Quoted 6 lines
 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
Quoted 6 lines

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.

--
Luca.

#3 lore raw

Hi,

Quoted 43 lines · Luca Coelho
Quoted 42 lines · Luca Coelho

Hi dude,

Great, this is cool! Finally! :)

A few comments...

Quoted 8 lines · Felipe Balbi

It's way overdue that we send these firmware blobs upstream. Thanks for everybody involved in getting this sorted out.

Cc Luciano Coelho <[email protected]>
Cc Pavel Machek <[email protected]>

---

The commit message could be a bit more descriptive rather than narrative?

Quoted 1 line
 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?

Quoted 6 lines
 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.

Quoted 4 lines
Quoted 1 line

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 <[email protected]>
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 <[email protected]>
Cc Pavel Machek <[email protected]>
LICENCE.wl1251 new file +59 -0
new file mode 100644
index 0000000..bd0f5f1
@@ -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.
WHENCE +13 -0
index e66fea5..4e9e2ed 100644
@@ -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
ti-connectivity/wl1251-fw.bin new file binary +0 -0
new file mode 100644
index 0000000..f89c983
Binary files /dev/null and b/ti-connectivity/wl1251-fw.bin differ
ti-connectivity/wl1251-nvs.bin new file binary +0 -0
new file mode 100644
index 0000000..2bf9c50
Binary files /dev/null and b/ti-connectivity/wl1251-nvs.bin differ
Signature · 1 line
balbi
#4 lore raw
Quoted 9 lines · Felipe Balbi
Quoted 8 lines · Luca Coelho
Quoted 6 lines · Luca Coelho

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!

Quoted 7 lines
Quoted 2 lines

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.

Cool, in general it looks good!

Though it would be nice to know if the same "new" license could be used for all the firmwares to avoid almost identical licenses.

More comments below...

WHENCE Licence: Redistributable. See LICENCE.tda7706-firmware.txt for details. · line 1711

Quoted 12 lines
WHENCE +4 -0
index e66fea5..4e9e2ed 100644
@@ -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

Don't you have the firmware version number to add here with "Version:" tags like the other ones? I think you can easily find the version by running strings on the binary and grepping for "Rev" (at least with the newer WiLinks, this works).

WHENCE Licence: Redistributable. See LICENCE.tda7706-firmware.txt for details. · line 1717

Quoted 5 lines
WHENCE +5 -0
+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/.

It's a bit stupid that this was never changed in wl1251, but it still expects the driver in the "root" firmwares directory (ie.
in /lib/firmware/wl1251-fw.bin, not
in /lib/firmware/ti-connectivity/wl1251-fw.bin). Maybe now is the right time to change the driver appropriately to keep consistency? ;)

--
Luca.

#5 lore raw
Quoted 18 lines · Luca Coelho
Quoted 9 lines · Felipe Balbi
Quoted 8 lines · Luca Coelho
Quoted 6 lines · Luca Coelho

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!

Quoted 7 lines
Quoted 2 lines

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.

Quoted 4 lines

Cool, in general it looks good!

Though it would be nice to know if the same "new" license could be used for all the firmwares to avoid almost identical licenses.

well, i'm not a lawyer :-s

Quoted 8 lines
Quoted 8 lines
WHENCE +0 -0
index e66fea5..4e9e2ed 100644
@@ -1705,6 +1705,19 @@ Licence: Redistributable. See LICENCE.tda7706-firmware.txt for details.
 
 --------------------------------------------------------------------------
 
Quoted 9 lines

WHENCE Licence: Redistributable. See LICENCE.tda7706-firmware.txt for details. · line 1711

Quoted 4 lines
WHENCE +4 -0
+Driver: wl1251 - Texas Instruments 802.11 WLAN driver for WiLink4 chips
+
+File: ti-connectivity/wl1251-fw.bin
+File: ti-connectivity/wl1251-nvs.bin

Don't you have the firmware version number to add here with "Version:" tags like the other ones? I think you can easily find the version by running strings on the binary and grepping for "Rev" (at least with the newer WiLinks, this works).

Done :-) thanks for the tip.

Quoted 11 lines

WHENCE Licence: Redistributable. See LICENCE.tda7706-firmware.txt for details. · line 1717

Quoted 5 lines
WHENCE +5 -0
+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/.

It's a bit stupid that this was never changed in wl1251, but it still expects the driver in the "root" firmwares directory (ie.
in /lib/firmware/wl1251-fw.bin, not
in /lib/firmware/ti-connectivity/wl1251-fw.bin). Maybe now is the right time to change the driver appropriately to keep consistency? ;)

alright, will do...

Signature · 1 line
balbi
#6 lore raw

[GIT PULL] firmware: wl1251 firmware binary

Hi,

here's a pull request for wl4 firmware. I'll send a patch for wl1251 driver updating firmware load path.

The following changes since commit b8ac7c7e27dcd13fa3c843aaf62457e9c57ea4db:

linux-firmware: Add Brocade FC/FCOE Adapter firmware files (2013-09-30 04:53:32 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/balbi/linux-firmware.git wilink4

for you to fetch changes up to d726804dbc8dad88587b6be17716714cd91ed86c:

ti-connectivity: add wl1251 firmware and license (2013-10-02 06:55:39 -0500)

----------------------------------------------------------------
Felipe Balbi (1):
ti-connectivity: add wl1251 firmware and license

 LICENCE.wl1251                 |  59 +++++++++++++++++++++++++++++++++++++++++
 WHENCE                         |  18 +++++++++++++
 ti-connectivity/wl1251-fw.bin  | Bin 0 -> 194180 bytes
 ti-connectivity/wl1251-nvs.bin | Bin 0 -> 752 bytes
 4 files changed, 77 insertions(+)
 create mode 100644 LICENCE.wl1251
 create mode 100644 ti-connectivity/wl1251-fw.bin
 create mode 100644 ti-connectivity/wl1251-nvs.bin
Signature · 1 line
balbi
#7 lore raw

Re: [GIT PULL] firmware: wl1251 firmware binary

Hi Felipe,

Quoted 21 lines · Felipe Balbi

Hi,

here's a pull request for wl4 firmware. I'll send a patch for wl1251 driver updating firmware load path.

The following changes since commit b8ac7c7e27dcd13fa3c843aaf62457e9c57ea4db:

linux-firmware: Add Brocade FC/FCOE Adapter firmware files (2013-09-30 04:53:32 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/balbi/linux-firmware.git wilink4

for you to fetch changes up to d726804dbc8dad88587b6be17716714cd91ed86c:

ti-connectivity: add wl1251 firmware and license (2013-10-02 06:55:39 -0500)

----------------------------------------------------------------
Felipe Balbi (1):
ti-connectivity: add wl1251 firmware and license

Quoted 8 lines
 LICENCE.wl1251                 |  59 +++++++++++++++++++++++++++++++++++++++++
 WHENCE                         |  18 +++++++++++++
 ti-connectivity/wl1251-fw.bin  | Bin 0 -> 194180 bytes
 ti-connectivity/wl1251-nvs.bin | Bin 0 -> 752 bytes
 4 files changed, 77 insertions(+)
 create mode 100644 LICENCE.wl1251
 create mode 100644 ti-connectivity/wl1251-fw.bin
 create mode 100644 ti-connectivity/wl1251-nvs.bin

Since you didn't send v2 of the patch, you could have used the -p option with git request-pull so we could see the changes you made here...

--
Cheers,
Luca.

#8 lore raw

Re: [GIT PULL] firmware: wl1251 firmware binary

Quoted 33 lines · Luca Coelho

Hi Felipe,

Quoted 21 lines · Felipe Balbi

Hi,

here's a pull request for wl4 firmware. I'll send a patch for wl1251 driver updating firmware load path.

The following changes since commit b8ac7c7e27dcd13fa3c843aaf62457e9c57ea4db:

linux-firmware: Add Brocade FC/FCOE Adapter firmware files (2013-09-30 04:53:32 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/balbi/linux-firmware.git wilink4

for you to fetch changes up to d726804dbc8dad88587b6be17716714cd91ed86c:

ti-connectivity: add wl1251 firmware and license (2013-10-02 06:55:39 -0500)

----------------------------------------------------------------
Felipe Balbi (1):
ti-connectivity: add wl1251 firmware and license

Quoted 8 lines
 LICENCE.wl1251                 |  59 +++++++++++++++++++++++++++++++++++++++++
 WHENCE                         |  18 +++++++++++++
 ti-connectivity/wl1251-fw.bin  | Bin 0 -> 194180 bytes
 ti-connectivity/wl1251-nvs.bin | Bin 0 -> 752 bytes
 4 files changed, 77 insertions(+)
 create mode 100644 LICENCE.wl1251
 create mode 100644 ti-connectivity/wl1251-fw.bin
 create mode 100644 ti-connectivity/wl1251-nvs.bin
Quoted 2 lines

Since you didn't send v2 of the patch, you could have used the -p option with git request-pull so we could see the changes you made here...

LICENCE.wl1251 new file +59 -0
new file mode 100644
index 0000000..bd0f5f1
@@ -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.
WHENCE +18 -0
index aac3ba9..3a35670 100644
@@ -1712,6 +1712,24 @@ 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
+Version: 4.0.4.3.7
+
+File: ti-connectivity/wl1251-nvs.bin
+
+Licence: See LICENCE.wl1251 for details.
+
+The published NVS files are for testing only.  Every device needs to
+have a unique NVS which is properly calibrated for best results.
+
+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
ti-connectivity/wl1251-fw.bin new file binary +0 -0
new file mode 100644
index 0000000..f89c983
Binary files /dev/null and b/ti-connectivity/wl1251-fw.bin differ
ti-connectivity/wl1251-nvs.bin new file binary +0 -0
new file mode 100644
index 0000000..2bf9c50
Binary files /dev/null and b/ti-connectivity/wl1251-nvs.bin differ
Signature · 1 line
balbi
Acked-by
#9 lore raw

Re: [GIT PULL] firmware: wl1251 firmware binary

ti-connectivity/wl1251-nvs.bin

Quoted 103 lines · Felipe Balbi
LICENCE.wl1251 new file +59 -0
new file mode 100644
index 0000000..bd0f5f1
@@ -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.
WHENCE +18 -0
index aac3ba9..3a35670 100644
@@ -1712,6 +1712,24 @@ 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
+Version: 4.0.4.3.7
+
+File: ti-connectivity/wl1251-nvs.bin
+
+Licence: See LICENCE.wl1251 for details.
+
+The published NVS files are for testing only.  Every device needs to
+have a unique NVS which is properly calibrated for best results.
+
+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
ti-connectivity/wl1251-fw.bin new file binary +0 -0
new file mode 100644
index 0000000..f89c983
Binary files /dev/null and b/ti-connectivity/wl1251-fw.bin differ
ti-connectivity/wl1251-nvs.bin new file binary +0 -0
new file mode 100644
index 0000000..2bf9c50
Binary files /dev/null and b/ti-connectivity/wl1251-nvs.bin differ

Looks good to me:

--
Luca.

#10 lore raw

Re: [GIT PULL] firmware: wl1251 firmware binary

In reply to Felipe Balbi
Quoted 21 lines · Felipe Balbi

Hi,

here's a pull request for wl4 firmware. I'll send a patch for wl1251 driver updating firmware load path.

The following changes since commit b8ac7c7e27dcd13fa3c843aaf62457e9c57ea4db:

linux-firmware: Add Brocade FC/FCOE Adapter firmware files (2013-09-30 04:53:32 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/balbi/linux-firmware.git wilink4

for you to fetch changes up to d726804dbc8dad88587b6be17716714cd91ed86c:

ti-connectivity: add wl1251 firmware and license (2013-10-02 06:55:39 -0500)

----------------------------------------------------------------
Felipe Balbi (1):
ti-connectivity: add wl1251 firmware and license

Quoted 8 lines
 LICENCE.wl1251                 |  59 +++++++++++++++++++++++++++++++++++++++++
 WHENCE                         |  18 +++++++++++++
 ti-connectivity/wl1251-fw.bin  | Bin 0 -> 194180 bytes
 ti-connectivity/wl1251-nvs.bin | Bin 0 -> 752 bytes
 4 files changed, 77 insertions(+)
 create mode 100644 LICENCE.wl1251
 create mode 100644 ti-connectivity/wl1251-fw.bin
 create mode 100644 ti-connectivity/wl1251-nvs.bin

Pulled, thanks.

Ben.

Signature · 3 lines
Ben Hutchings
Beware of bugs in the above code;
I have only proved it correct, not tried it. - Donald Knuth
#11 lore raw
In reply to Felipe Balbi
Quoted 3 lines · Felipe Balbi

Hi,

On Wed, Sep 25, 2013 at 02:07:58PM +0300, Luca Coelho wrote:

[...]

Quoted 7 lines
Quoted 2 lines

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.

[...]

I haven't seen this pull request, so it looks like there is nothing for me to apply at the moment.

Ben.

Signature · 3 lines
Ben Hutchings
Life is like a sewer:
what you get out of it depends on what you put into it.
#12 lore raw
Quoted 8 lines · Ben Hutchings
Quoted 3 lines · Felipe Balbi

Hi,

On Wed, Sep 25, 2013 at 02:07:58PM +0300, Luca Coelho wrote:

[...]

Quoted 3 lines
Quoted 2 lines

Ah, and I forgot to say that you should update the WHENCE file accordingly too. Check the wl12xx and wl18xx drivers for examples.

Quoted 8 lines
Quoted 4 lines

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.

[...]

I haven't seen this pull request, so it looks like there is nothing for me to apply at the moment.

yeah, give me a couple more days, I need to finish something up here.

cheers

Signature · 1 line
balbi
#13 lore raw
In reply to Luca Coelho

Hi,

Quoted 12 lines · Luca Coelho

Hi dude,

Great, this is cool! Finally! :)

A few comments...

Quoted 4 lines · Felipe Balbi

It's way overdue that we send these firmware blobs upstream. Thanks for everybody involved in getting this sorted out.

Quoted 7 lines
Quoted 4 lines
Cc Luciano Coelho <[email protected]>
Cc Pavel Machek <[email protected]>

---

The commit message could be a bit more descriptive rather than narrative?

sure, why not.

Quoted 7 lines
Quoted 1 line
 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?

let me check.

Quoted 11 lines
Quoted 6 lines
 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.

will do

Quoted 1 line

Thank you very much for following up on this!

np.

Signature · 1 line
balbi