diff options
-rw-r--r-- | Android.mk | 28 | ||||
-rw-r--r-- | wl12xx/wlan/LICENSE | 91 | ||||
-rw-r--r-- | wl12xx/wlan/wl12xx-wlan-fw-products.mk | 2 | ||||
-rw-r--r-- | wl12xx/wlan/wlan.tgz | bin | 1049031 -> 1253671 bytes |
4 files changed, 75 insertions, 46 deletions
@@ -170,6 +170,34 @@ $(LOCAL_BUILT_MODULE) : $(wl12xx-wlan.untarred_timestamp) | $(ACP) | |||
170 | @mkdir -p $(dir $@) | 170 | @mkdir -p $(dir $@) |
171 | $(hide) $(ACP) -fp $(PRIVATE_SRC) $@ | 171 | $(hide) $(ACP) -fp $(PRIVATE_SRC) $@ |
172 | 172 | ||
173 | include $(CLEAR_VARS) | ||
174 | LOCAL_MODULE := wl18xx-fw.bin | ||
175 | LOCAL_MODULE_CLASS := FAKE | ||
176 | LOCAL_MODULE_TAGS := optional | ||
177 | LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware/ti-connectivity | ||
178 | |||
179 | include $(BUILD_SYSTEM)/base_rules.mk | ||
180 | |||
181 | $(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(wl12xx-wlan.untarred_intermediates)/wlan/wl18xx-fw.bin | ||
182 | $(LOCAL_BUILT_MODULE) : $(wl12xx-wlan.untarred_timestamp) | $(ACP) | ||
183 | @echo "Copy $@ <- $(PRIVATE_SRC)" | ||
184 | @mkdir -p $(dir $@) | ||
185 | $(hide) $(ACP) -fp $(PRIVATE_SRC) $@ | ||
186 | |||
187 | include $(CLEAR_VARS) | ||
188 | LOCAL_MODULE := wl18xx-conf.bin | ||
189 | LOCAL_MODULE_CLASS := FAKE | ||
190 | LOCAL_MODULE_TAGS := optional | ||
191 | LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware/ti-connectivity | ||
192 | |||
193 | include $(BUILD_SYSTEM)/base_rules.mk | ||
194 | |||
195 | $(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(wl12xx-wlan.untarred_intermediates)/wlan/wl18xx-conf.bin | ||
196 | $(LOCAL_BUILT_MODULE) : $(wl12xx-wlan.untarred_timestamp) | $(ACP) | ||
197 | @echo "Copy $@ <- $(PRIVATE_SRC)" | ||
198 | @mkdir -p $(dir $@) | ||
199 | $(hide) $(ACP) -fp $(PRIVATE_SRC) $@ | ||
200 | |||
173 | endif | 201 | endif |
174 | 202 | ||
175 | ################################################################################ | 203 | ################################################################################ |
diff --git a/wl12xx/wlan/LICENSE b/wl12xx/wlan/LICENSE index 606c12d..10ff779 100644 --- a/wl12xx/wlan/LICENSE +++ b/wl12xx/wlan/LICENSE | |||
@@ -1,46 +1,45 @@ | |||
1 | 1 TECHNOLOGY AND SOFTWARE PUBLICLY AVAILABLE | 1 | TECHNOLOGY AND SOFTWARE PUBLICLY AVAILABLE |
2 | 2 SOFTWARE LICENSE | 2 | SOFTWARE LICENSE |
3 | 3 | 3 | |
4 | 4 Copyright (c) 2011, Texas Instruments Incorporated. | 4 | Copyright (c) 2011, Texas Instruments Incorporated. |
5 | 5 | 5 | |
6 | 6 All rights reserved. | 6 | All rights reserved not granted herein. |
7 | 7 | 7 | |
8 | 8 Redistribution. | 8 | Limited License. |
9 | 9 | 9 | |
10 | 10 Redistribution and use in binary form, without modification, are | 10 | Texas Instruments Incorporated grants a world-wide, royalty-free, non-exclusive license under |
11 | 11 permitted provided that the following conditions are met: | 11 | copyrights and patents it now or hereafter owns or controls to make, have made, use, import, |
12 | 12 | 12 | offer to sell and sell ("Utilize") this software, but solely to the extent that any such patent is |
13 | 13 * Redistributions must preserve existing copyright notices and reproduce | 13 | necessary to Utilize the software alone. The patent license shall not apply to any combinations |
14 | 14 this license (including the above copyright notice and the disclaimer below) | 14 | which include this software. No hardware per se is licensed hereunder. |
15 | 15 in the documentation and/or other materials provided with the distribution. | 15 | |
16 | 16 | 16 | Redistribution and use in binary form, without modification, are permitted provided that the |
17 | 17 * Neither the name of Texas Instruments Incorporated nor the names of | 17 | following conditions are met: |
18 | 18 its suppliers may be used to endorse or promote products derived | 18 | |
19 | 19 from this software without specific prior written permission. | 19 | * Redistributions must preserve existing copyright notices and reproduce this license (including |
20 | 20 | 20 | the above copyright notice and the disclaimer below) in the documentation and/or other |
21 | 21 * No reverse engineering, decompilation, or disassembly of this | 21 | materials provided with the distribution. |
22 | 22 software is permitted. | 22 | |
23 | 23 | 23 | * Neither the name of Texas Instruments Incorporated nor the names of its suppliers may be |
24 | 24 Limited patent license. | 24 | used to endorse or promote products derived from this software without specific prior written |
25 | 25 | 25 | permission. |
26 | 26 Texas Instruments Incorporated grants a world-wide, royalty-free, | 26 | |
27 | 27 non-exclusive license under patents it now or hereafter owns or controls | 27 | * No reverse engineering, decompilation, or disassembly of this software is permitted. |
28 | 28 to make, have made, use, import, offer to sell and sell ("Utilize") this | 28 | |
29 | 29 software, but solely to the extent that any such patent is necessary | 29 | * Nothing shall obligate TI to provide you with source code for the software licensed and |
30 | 30 to Utilize the software alone. The patent license shall not apply to | 30 | provided to you in object code. |
31 | 31 any combinations which include this software. No hardware per se is | 31 | |
32 | 32 licensed hereunder. | 32 | |
33 | 33 | 33 | DISCLAIMER. |
34 | 34 DISCLAIMER. | 34 | |
35 | 35 | 35 | THIS SOFTWARE IS PROVIDED BY THE TI AND TI'S LICENSES "AS IS" AND ANY |
36 | 36 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 36 | EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
37 | 37 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 37 | WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
38 | 38 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 38 | DISCLAIMED. IN NO EVENT SHALL TI AND TI'S LICENSES BE LIABLE FOR ANY DIRECT, |
39 | 39 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 39 | INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
40 | 40 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 40 | (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR |
41 | 41 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 41 | SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
42 | 42 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 42 | HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
43 | 43 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 43 | STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
44 | 44 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 44 | ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
45 | 45 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 45 | POSSIBILITY OF SUCH DAMAGE. |
46 | 46 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
diff --git a/wl12xx/wlan/wl12xx-wlan-fw-products.mk b/wl12xx/wlan/wl12xx-wlan-fw-products.mk index 6b7671e..f29031a 100644 --- a/wl12xx/wlan/wl12xx-wlan-fw-products.mk +++ b/wl12xx/wlan/wl12xx-wlan-fw-products.mk | |||
@@ -25,5 +25,7 @@ PRODUCT_PACKAGES += \ | |||
25 | wl127x-fw-4-mr.bin \ | 25 | wl127x-fw-4-mr.bin \ |
26 | wl127x-fw-4-plt.bin \ | 26 | wl127x-fw-4-plt.bin \ |
27 | wl127x-fw-4-sr.bin \ | 27 | wl127x-fw-4-sr.bin \ |
28 | wl18xx-fw.bin \ | ||
29 | wl18xx-conf.bin \ | ||
28 | wl1271-nvs.bin \ | 30 | wl1271-nvs.bin \ |
29 | wl1271-nvs_127x.bin | 31 | wl1271-nvs_127x.bin |
diff --git a/wl12xx/wlan/wlan.tgz b/wl12xx/wlan/wlan.tgz index 109adb1..361912e 100644 --- a/wl12xx/wlan/wlan.tgz +++ b/wl12xx/wlan/wlan.tgz | |||
Binary files differ | |||