Merge branch 'master' of git://git.ti.com/wilink8-wlan/linux-firmware

Signed-off-by: Kyle McMartin <kyle@kernel.org>
This commit is contained in:
Kyle McMartin 2016-03-11 09:12:27 -08:00
commit deb1d83635
3 changed files with 50 additions and 35 deletions

View File

@ -1,46 +1,61 @@
TECHNOLOGY AND SOFTWARE PUBLICLY AVAILABLE
SOFTWARE LICENSE
Copyright (c) 2016 Texas Instruments Incorporated
Copyright (c) 2011, Texas Instruments Incorporated.
All rights reserved not granted herein.
All rights reserved.
Limited License.
Redistribution.
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.
Redistribution and use in binary form, without modification, are
permitted provided that the following conditions are met:
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
* Redistributions must preserve existing copyright notices and reproduce
this license (including the above copyright notice and the disclaimer 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:
* 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.
* No reverse engineering, decompilation, or disassembly of this
software is permitted with respect to any software provided in binary
form.
* No reverse engineering, decompilation, or disassembly of this
software is permitted.
* any redistribution and use are licensed by TI for use only with TI
Devices.
Limited patent license.
* Nothing shall obligate TI to provide you with source code for the
software licensed and provided to you in object code.
Texas Instruments Incorporated grants a world-wide, royalty-free,
non-exclusive license under patents it now or hereafter owns or controls
to make, have made, use, import, offer to sell and sell ("Utilize") this
software, but 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. No hardware per se is
licensed hereunder.
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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"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 THE COPYRIGHT
OWNER OR CONTRIBUTORS 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.
THIS SOFTWARE IS PROVIDED BY TI AND TIS 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 TIS 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.

2
WHENCE
View File

@ -2165,7 +2165,7 @@ Version: 8.5.0.0.55
File: ti-connectivity/wl18xx-fw-3.bin
Version: 8.8.0.0.13
File: ti-connectivity/wl18xx-fw-4.bin
Version: 8.9.0.0.39
Version: 8.9.0.1.55
Licence: Redistributable. See LICENCE.ti-connectivity for details.

Binary file not shown.