diff options
author | Keith Deacon | 2012-08-27 16:41:36 -0500 |
---|---|---|
committer | Keith Deacon | 2012-08-27 16:41:36 -0500 |
commit | dfa5c28fe29b18490a0cd601b8f7d79ce76ea918 (patch) | |
tree | 0f632795ffd25774513fa5d4f156fa387b52cd15 | |
parent | 3b211a8b1039c102d04eeff7053a99beaf0cded3 (diff) | |
parent | 14109844cc22d0ee512d569a09825a0404400079 (diff) | |
download | device-ti-proprietary-open-dfa5c28fe29b18490a0cd601b8f7d79ce76ea918.tar.gz device-ti-proprietary-open-dfa5c28fe29b18490a0cd601b8f7d79ce76ea918.tar.xz device-ti-proprietary-open-dfa5c28fe29b18490a0cd601b8f7d79ce76ea918.zip |
Merge jb-release into d-jb-release
-rw-r--r-- | Android.mk | 31 | ||||
-rw-r--r-- | omap4/README.SGX | 10 | ||||
-rw-r--r-- | omap4/sgx.tgz | bin | 4626350 -> 4628660 bytes | |||
-rw-r--r-- | omap4/sgx_src/eurasia_km.tgz | bin | 2815873 -> 2816241 bytes | |||
-rw-r--r-- | omap4/ti-omap4-vendor.mk | 3 | ||||
-rw-r--r-- | wl12xx/License_for_WPAN_Binary_Images.txt | 46 | ||||
-rw-r--r-- | wl12xx/wpan.tgz | bin | 80801 -> 81557 bytes |
7 files changed, 83 insertions, 7 deletions
@@ -4,8 +4,6 @@ img-sgx.untarred_timestamp := $(img-sgx.untarred_intermediates)/stamp | |||
4 | img-sgx.untarred_bin := $(img-sgx.untarred_intermediates)/sgx | 4 | img-sgx.untarred_bin := $(img-sgx.untarred_intermediates)/sgx |
5 | img-sgx.tar := $(LOCAL_PATH)/$(TARGET_BOARD_PLATFORM)/sgx.tgz | 5 | img-sgx.tar := $(LOCAL_PATH)/$(TARGET_BOARD_PLATFORM)/sgx.tgz |
6 | 6 | ||
7 | $(hide $(shell $(LOCAL_PATH)/untar.sh $(LOCAL_PATH)/wl12xx wpan $(LOCAL_PATH)/wl12xx/wpan.tgz)) | ||
8 | |||
9 | include $(call all-subdir-makefiles) | 7 | include $(call all-subdir-makefiles) |
10 | 8 | ||
11 | $(img-sgx.untarred_timestamp) : $(img-sgx.tar) | 9 | $(img-sgx.untarred_timestamp) : $(img-sgx.tar) |
@@ -201,3 +199,32 @@ $(LOCAL_BUILT_MODULE) : $(wl12xx-wlan.untarred_timestamp) | $(ACP) | |||
201 | endif | 199 | endif |
202 | 200 | ||
203 | ################################################################################ | 201 | ################################################################################ |
202 | # Install WPAN firmware files | ||
203 | ############################################################################### | ||
204 | WPAN_TGZ := device/ti/proprietary-open/wl12xx/wpan.tgz | ||
205 | |||
206 | ifneq ($(WPAN_TGZ),) | ||
207 | include $(CLEAR_VARS) | ||
208 | |||
209 | wpan.untarred_intermediates := $(call intermediates-dir-for, FAKE, wpan.untarred) | ||
210 | wpan.untarred_timestamp := $(wpan.untarred_intermediates)/stamp | ||
211 | |||
212 | WPAN_FW_LOCAL_PATH:= device/ti/proprietary-open/wl12xx/ | ||
213 | LOCAL_MODULE := ti-wpan-fw | ||
214 | LOCAL_MODULE_CLASS := FAKE | ||
215 | LOCAL_MODULE_TAGS := optional | ||
216 | |||
217 | include $(BUILD_SYSTEM)/base_rules.mk | ||
218 | |||
219 | $(LOCAL_BUILT_MODULE) : $(WPAN_TGZ) | ||
220 | echo "Unzip $(wpan.untarred_intermediates) <- $<" | ||
221 | $(hide) rm -rvf $(wpan.untarred_intermediates)/wpan | ||
222 | $(hide) mkdir -p $(wpan.untarred_intermediates) | ||
223 | $(hide) tar -C $(wpan.untarred_intermediates) -zvxf $< | ||
224 | $(hide) touch $(wpan.untarred_intermediates) | ||
225 | |||
226 | $(LOCAL_INSTALLED_MODULE) : $(LOCAL_BUILT_MODULE) | $(ACP) | ||
227 | @echo "Copying wpan firmware ..." | ||
228 | @mkdir -p $(PRODUCT_OUT)/system/etc/firmware | ||
229 | $(hide) $(ACP) -rfpv $(wpan.untarred_intermediates)/wpan/*/*.bts $(PRODUCT_OUT)/system/etc/firmware/ | ||
230 | endif | ||
diff --git a/omap4/README.SGX b/omap4/README.SGX index a87eb58..25ba749 100644 --- a/omap4/README.SGX +++ b/omap4/README.SGX | |||
@@ -8,16 +8,18 @@ wrapper which detects the current processor and loads the corresponding core spe | |||
8 | pvrsrvinit. | 8 | pvrsrvinit. |
9 | 9 | ||
10 | [DDK Version] | 10 | [DDK Version] |
11 | 1.9@2120756 | 11 | 1.9@2130229 |
12 | [DDK commit ID] | 12 | [DDK commit ID] |
13 | 18545f4 SGX UM: HACK: add extra read in SGXInitialise Script 1 | 13 | d75394f SGX KM: Fix num_handle calculation for ion handles |
14 | [Branch] | 14 | [Branch] |
15 | 1.9/2120756 | 15 | 1.9/2130229 |
16 | [Kernel modules built against] | 16 | [Kernel modules built against] |
17 | Kernel Version: 3.0.31 with CONFIG_MODVERSIONS=y and CONFIG_SCHED_TRACER=y | 17 | Kernel Version: 3.0.31 with CONFIG_MODVERSIONS=y and CONFIG_SCHED_TRACER=y |
18 | 18 | ||
19 | This kernel also now has omaplfb added to it: | 19 | This DDK require kernel patch for bltsville update header to 2.2 |
20 | http://review.omapzoom.org/#/c/26780/ | ||
20 | 21 | ||
22 | This kernel also now has omaplfb added to it: | ||
21 | commit b49820dbb7d5851101136e8e27210cb410fc9822 | 23 | commit b49820dbb7d5851101136e8e27210cb410fc9822 |
22 | Author: Hemant Hariyani <hemanthariyani@ti.com> | 24 | Author: Hemant Hariyani <hemanthariyani@ti.com> |
23 | Date: Thu Jul 26 14:16:53 2012 -0500 | 25 | Date: Thu Jul 26 14:16:53 2012 -0500 |
diff --git a/omap4/sgx.tgz b/omap4/sgx.tgz index b4a79d6..02ac705 100644 --- a/omap4/sgx.tgz +++ b/omap4/sgx.tgz | |||
Binary files differ | |||
diff --git a/omap4/sgx_src/eurasia_km.tgz b/omap4/sgx_src/eurasia_km.tgz index d6cdaef..2529b04 100644 --- a/omap4/sgx_src/eurasia_km.tgz +++ b/omap4/sgx_src/eurasia_km.tgz | |||
Binary files differ | |||
diff --git a/omap4/ti-omap4-vendor.mk b/omap4/ti-omap4-vendor.mk index 24679f2..fd76f06 100644 --- a/omap4/ti-omap4-vendor.mk +++ b/omap4/ti-omap4-vendor.mk | |||
@@ -18,4 +18,5 @@ | |||
18 | 18 | ||
19 | PRODUCT_PACKAGES += \ | 19 | PRODUCT_PACKAGES += \ |
20 | ti_omap4_sgx_libs \ | 20 | ti_omap4_sgx_libs \ |
21 | ti_omap4_ducati_libs | 21 | ti_omap4_ducati_libs \ |
22 | ti-wpan-fw | ||
diff --git a/wl12xx/License_for_WPAN_Binary_Images.txt b/wl12xx/License_for_WPAN_Binary_Images.txt new file mode 100644 index 0000000..606c12d --- /dev/null +++ b/wl12xx/License_for_WPAN_Binary_Images.txt | |||
@@ -0,0 +1,46 @@ | |||
1 | 1 TECHNOLOGY AND SOFTWARE PUBLICLY AVAILABLE | ||
2 | 2 SOFTWARE LICENSE | ||
3 | 3 | ||
4 | 4 Copyright (c) 2011, Texas Instruments Incorporated. | ||
5 | 5 | ||
6 | 6 All rights reserved. | ||
7 | 7 | ||
8 | 8 Redistribution. | ||
9 | 9 | ||
10 | 10 Redistribution and use in binary form, without modification, are | ||
11 | 11 permitted provided that the following conditions are met: | ||
12 | 12 | ||
13 | 13 * Redistributions must preserve existing copyright notices and reproduce | ||
14 | 14 this license (including the above copyright notice and the disclaimer below) | ||
15 | 15 in the documentation and/or other materials provided with the distribution. | ||
16 | 16 | ||
17 | 17 * Neither the name of Texas Instruments Incorporated nor the names of | ||
18 | 18 its suppliers may be used to endorse or promote products derived | ||
19 | 19 from this software without specific prior written permission. | ||
20 | 20 | ||
21 | 21 * No reverse engineering, decompilation, or disassembly of this | ||
22 | 22 software is permitted. | ||
23 | 23 | ||
24 | 24 Limited patent license. | ||
25 | 25 | ||
26 | 26 Texas Instruments Incorporated grants a world-wide, royalty-free, | ||
27 | 27 non-exclusive license under patents it now or hereafter owns or controls | ||
28 | 28 to make, have made, use, import, offer to sell and sell ("Utilize") this | ||
29 | 29 software, but solely to the extent that any such patent is necessary | ||
30 | 30 to Utilize the software alone. The patent license shall not apply to | ||
31 | 31 any combinations which include this software. No hardware per se is | ||
32 | 32 licensed hereunder. | ||
33 | 33 | ||
34 | 34 DISCLAIMER. | ||
35 | 35 | ||
36 | 36 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
37 | 37 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
38 | 38 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
39 | 39 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
40 | 40 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
41 | 41 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
42 | 42 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
43 | 43 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
44 | 44 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
45 | 45 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
46 | 46 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
diff --git a/wl12xx/wpan.tgz b/wl12xx/wpan.tgz index fe3b7c9..243b8fb 100644 --- a/wl12xx/wpan.tgz +++ b/wl12xx/wpan.tgz | |||
Binary files differ | |||