summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishal Mahaveer2016-09-15 16:18:59 -0500
committerVishal Mahaveer2017-08-22 12:02:00 -0500
commitb8292128dea8d5209757fdb2c6449b3432b938dd (patch)
treed4ba7c488f9507d45ba5ffb46853efc1eaf3f818
parentaa32cc31ce4d068a687aa3036f453aaa6d8c3b08 (diff)
downloaddevice-ti-proprietary-open-b8292128dea8d5209757fdb2c6449b3432b938dd.tar.gz
device-ti-proprietary-open-b8292128dea8d5209757fdb2c6449b3432b938dd.tar.xz
device-ti-proprietary-open-b8292128dea8d5209757fdb2c6449b3432b938dd.zip
wl12xx: fix build issue and align firmware extraction
Current wl12xx firmware package installation is failing on Android N. Fix this by aligning it to match sgx and IPU firmware builds. Change-Id: Id78dafe8ee46073ca3aeccc17e36ce0b9b8287a7 Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
-rw-r--r--wl12xx/Android.mk2
-rw-r--r--wl12xx/wlan/Android.mk50
-rw-r--r--wl12xx/wpan/Android.mk30
-rw-r--r--wl12xx/wpan/bluetooth/Android.mk107
l---------wl12xx/wpan/bluetooth/NOTICE1
-rw-r--r--wl12xx/wpan/bluetooth/wl12xx-wpan-bt-fw-products.mk26
-rw-r--r--wl12xx/wpan/wl12xx-wpan-fw-products.mk5
-rw-r--r--wl12xx/wpan/wpan.tgzbin195338 -> 11651 bytes
8 files changed, 57 insertions, 164 deletions
diff --git a/wl12xx/Android.mk b/wl12xx/Android.mk
index 7f2d146..b80341e 100644
--- a/wl12xx/Android.mk
+++ b/wl12xx/Android.mk
@@ -15,6 +15,4 @@
15 15
16LOCAL_PATH := $(call my-dir) 16LOCAL_PATH := $(call my-dir)
17 17
18TARGET_EXTRACTED_FW := $(PRODUCT_OUT)/extracted_firmwares
19
20include $(call all-makefiles-under, $(LOCAL_PATH)) 18include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/wl12xx/wlan/Android.mk b/wl12xx/wlan/Android.mk
index fb1140e..0901df3 100644
--- a/wl12xx/wlan/Android.mk
+++ b/wl12xx/wlan/Android.mk
@@ -18,41 +18,43 @@ ifeq ($(strip $(BOARD_WLAN_DEVICE)),wl12xx_mac80211)
18 18
19TI_WILINK_FW_PATH := $(TARGET_OUT_ETC)/firmware/ti-connectivity 19TI_WILINK_FW_PATH := $(TARGET_OUT_ETC)/firmware/ti-connectivity
20 20
21WLAN_FW_BINS := \ 21ti-wl12xx-wlan.untarred_intermediates := $(call intermediates-dir-for, FAKE, ti-wl12xx-wlan.untarred)
22 wl18xx-fw-4.bin \ 22ti-wl12xx-wlan.untarred_timestamp := $(ti-wl12xx-wlan.untarred_intermediates)/stamp
23 wl18xx-conf.bin
24 23
25# path to FM fws (related to top dir) 24$(ti-wl12xx-wlan.untarred_timestamp) : $(WLAN_TGZ)
26FW_WLAN_PATH := $(TARGET_EXTRACTED_FW)/wlan 25 @echo "Unzip $(dir $@) <- $<)"
27 26 $(hide) rm -rf $(dir $@) && mkdir -p $(dir $@)
28# path related to current location 27 $(hide) tar -C $(dir $@) -zxf $<
29FW_WLAN_FULL_PATH := ../../../../../$(FW_WLAN_PATH) 28 $(hide) touch $@
30 29
31include $(CLEAR_VARS) 30include $(CLEAR_VARS)
32LOCAL_MODULE := wl18xx-fw-4.bin 31LOCAL_MODULE := wl18xx-fw-4.bin
33LOCAL_SRC_FILES := $(FW_WLAN_FULL_PATH)/wl18xx-fw-4.bin 32LOCAL_SRC_FILES := wl18xx-fw-4.bin
34LOCAL_MODULE_CLASS := FIRMWARE 33LOCAL_MODULE_CLASS := FAKE
35LOCAL_MODULE_PATH := $(TI_WILINK_FW_PATH) 34LOCAL_MODULE_PATH := $(TI_WILINK_FW_PATH)
36LOCAL_MODULE_TAGS := optional 35LOCAL_MODULE_TAGS := optional
37LOCAL_MODULE_OWNER := ti 36
38include $(BUILD_PREBUILT) 37include $(BUILD_SYSTEM)/base_rules.mk
38
39$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(ti-wl12xx-wlan.untarred_intermediates)/wlan/wl18xx-fw-4.bin
40$(LOCAL_BUILT_MODULE) : $(ti-wl12xx-wlan.untarred_timestamp) | $(ACP)
41 @echo "Copy $@ <- $(PRIVATE_SRC)"
42 @mkdir -p $(dir $@)
43 $(hide) $(ACP) -fp $(PRIVATE_SRC) $@
44
39include $(CLEAR_VARS) 45include $(CLEAR_VARS)
40LOCAL_MODULE := wl18xx-conf.bin 46LOCAL_MODULE := wl18xx-conf.bin
41LOCAL_SRC_FILES := $(FW_WLAN_FULL_PATH)/wl18xx-conf.bin 47LOCAL_SRC_FILES := wl18xx-conf.bin
42LOCAL_MODULE_CLASS := FIRMWARE 48LOCAL_MODULE_CLASS := FAKE
43LOCAL_MODULE_PATH := $(TI_WILINK_FW_PATH) 49LOCAL_MODULE_PATH := $(TI_WILINK_FW_PATH)
44LOCAL_MODULE_TAGS := optional 50LOCAL_MODULE_TAGS := optional
45LOCAL_MODULE_OWNER := ti
46include $(BUILD_PREBUILT)
47 51
48WLAN_FW_FILES := $(addprefix $(LOCAL_PATH)/$(FW_WLAN_FULL_PATH)/, $(WLAN_FW_BINS)) 52include $(BUILD_SYSTEM)/base_rules.mk
49.PHONY: $(WLAN_FW_FILES)
50$(WLAN_FW_FILES): $(FW_WLAN_FULL_PATH)
51 $(hide) tar -C $(FW_WLAN_PATH) --strip-components=1 \
52 -f $(WLAN_TGZ) -xzp wlan/$(notdir $@)
53 53
54$(FW_WLAN_FULL_PATH): 54$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(ti-wl12xx-wlan.untarred_intermediates)/wlan/wl18xx-conf.bin
55 $(hide) mkdir -p $(FW_WLAN_PATH) 55$(LOCAL_BUILT_MODULE) : $(ti-wl12xx-wlan.untarred_timestamp) | $(ACP)
56 @echo "Copy $@ <- $(PRIVATE_SRC)"
57 @mkdir -p $(dir $@)
58 $(hide) $(ACP) -fp $(PRIVATE_SRC) $@
56 59
57endif 60endif
58
diff --git a/wl12xx/wpan/Android.mk b/wl12xx/wpan/Android.mk
index a47f6c0..47de12a 100644
--- a/wl12xx/wpan/Android.mk
+++ b/wl12xx/wpan/Android.mk
@@ -15,6 +15,32 @@
15 15
16LOCAL_PATH := $(call my-dir) 16LOCAL_PATH := $(call my-dir)
17 17
18WPAN_TGZ := device/ti/proprietary-open/wl12xx/wpan/wpan.tgz 18ifeq ($(strip $(BOARD_HAVE_BLUETOOTH_TI)),true)
19 19
20include $(call all-makefiles-under, $(LOCAL_PATH)) 20TI_WILINK_BT_FW_PATH := $(TARGET_OUT_ETC)/firmware
21
22ti-wl12xx-wpan.untarred_intermediates := $(call intermediates-dir-for, FAKE, ti-wl12xx-wpan.untarred)
23ti-wl12xx-wpan.untarred_timestamp := $(ti-wl12xx-wpan.untarred_intermediates)/stamp
24
25$(ti-wl12xx-wpan.untarred_timestamp) : $(WPAN_TGZ)
26 @echo "Unzip $(dir $@) <- $<)"
27 $(hide) rm -rf $(dir $@) && mkdir -p $(dir $@)
28 $(hide) tar -C $(dir $@) -zxf $<
29 $(hide) touch $@
30
31include $(CLEAR_VARS)
32LOCAL_MODULE := TIInit_12.10.28.bts
33LOCAL_SRC_FILES := TIInit_12.10.28.bts
34LOCAL_MODULE_CLASS := FAKE
35LOCAL_MODULE_PATH := $(TI_WILINK_BT_FW_PATH)
36LOCAL_MODULE_TAGS := optional
37
38include $(BUILD_SYSTEM)/base_rules.mk
39
40$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(ti-wl12xx-wpan.untarred_intermediates)/wpan/bluetooth/TIInit_12.10.28.bts
41$(LOCAL_BUILT_MODULE) : $(ti-wl12xx-wpan.untarred_timestamp) | $(ACP)
42 @echo "Copy $@ <- $(PRIVATE_SRC)"
43 @mkdir -p $(dir $@)
44 $(hide) $(ACP) -fp $(PRIVATE_SRC) $@
45
46endif
diff --git a/wl12xx/wpan/bluetooth/Android.mk b/wl12xx/wpan/bluetooth/Android.mk
deleted file mode 100644
index c991578..0000000
--- a/wl12xx/wpan/bluetooth/Android.mk
+++ /dev/null
@@ -1,107 +0,0 @@
1# Copyright (C) 2013 The Android Open Source Project
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
15LOCAL_PATH := $(call my-dir)
16
17ifeq ($(strip $(BOARD_HAVE_BLUETOOTH_TI)),true)
18
19TI_WILINK_BT_FW_PATH := $(TARGET_OUT_ETC)/firmware
20
21WPAN_BT_FW_BINS := \
22 TIInit_7.2.31.bts \
23 TIInit_7.6.15.bts \
24 TIInit_10.6.15.bts \
25 TIInit_11.8.32.bts \
26 TIInit_12.7.27.bts \
27 TIInit_12.8.32.bts \
28 TIInit_12.10.28.bts
29
30# path to BT fws (related to top dir)
31FW_BT_PATH := $(TARGET_EXTRACTED_FW)/bt
32
33# path related to current location
34FW_BT_FULL_PATH := ../../../../../../$(FW_BT_PATH)
35
36include $(CLEAR_VARS)
37LOCAL_MODULE := TIInit_7.2.31.bts
38LOCAL_SRC_FILES := $(FW_BT_FULL_PATH)/TIInit_7.2.31.bts
39LOCAL_MODULE_CLASS := FIRMWARE
40LOCAL_MODULE_PATH := $(TI_WILINK_BT_FW_PATH)
41LOCAL_MODULE_TAGS := optional
42LOCAL_MODULE_OWNER := ti
43include $(BUILD_PREBUILT)
44include $(CLEAR_VARS)
45LOCAL_MODULE := TIInit_7.6.15.bts
46LOCAL_SRC_FILES := $(FW_BT_FULL_PATH)/TIInit_7.6.15.bts
47LOCAL_MODULE_CLASS := FIRMWARE
48LOCAL_MODULE_PATH := $(TI_WILINK_BT_FW_PATH)
49LOCAL_MODULE_TAGS := optional
50LOCAL_MODULE_OWNER := ti
51include $(BUILD_PREBUILT)
52
53include $(CLEAR_VARS)
54LOCAL_MODULE := TIInit_10.6.15.bts
55LOCAL_SRC_FILES := $(FW_BT_FULL_PATH)/TIInit_10.6.15.bts
56LOCAL_MODULE_CLASS := FIRMWARE
57LOCAL_MODULE_PATH := $(TI_WILINK_BT_FW_PATH)
58LOCAL_MODULE_TAGS := optional
59LOCAL_MODULE_OWNER := ti
60include $(BUILD_PREBUILT)
61
62include $(CLEAR_VARS)
63LOCAL_MODULE := TIInit_11.8.32.bts
64LOCAL_SRC_FILES := $(FW_BT_FULL_PATH)/TIInit_11.8.32.bts
65LOCAL_MODULE_CLASS := FIRMWARE
66LOCAL_MODULE_PATH := $(TI_WILINK_BT_FW_PATH)
67LOCAL_MODULE_TAGS := optional
68LOCAL_MODULE_OWNER := ti
69include $(BUILD_PREBUILT)
70
71include $(CLEAR_VARS)
72LOCAL_MODULE := TIInit_12.7.27.bts
73LOCAL_SRC_FILES := $(FW_BT_FULL_PATH)/TIInit_12.7.27.bts
74LOCAL_MODULE_CLASS := FIRMWARE
75LOCAL_MODULE_PATH := $(TI_WILINK_BT_FW_PATH)
76LOCAL_MODULE_TAGS := optional
77LOCAL_MODULE_OWNER := ti
78include $(BUILD_PREBUILT)
79
80include $(CLEAR_VARS)
81LOCAL_MODULE := TIInit_12.8.32.bts
82LOCAL_SRC_FILES := $(FW_BT_FULL_PATH)/TIInit_12.8.32.bts
83LOCAL_MODULE_CLASS := FIRMWARE
84LOCAL_MODULE_PATH := $(TI_WILINK_BT_FW_PATH)
85LOCAL_MODULE_TAGS := optional
86LOCAL_MODULE_OWNER := ti
87include $(BUILD_PREBUILT)
88
89include $(CLEAR_VARS)
90LOCAL_MODULE := TIInit_12.10.28.bts
91LOCAL_SRC_FILES := $(FW_BT_FULL_PATH)/TIInit_12.10.28.bts
92LOCAL_MODULE_CLASS := FIRMWARE
93LOCAL_MODULE_PATH := $(TI_WILINK_BT_FW_PATH)
94LOCAL_MODULE_TAGS := optional
95LOCAL_MODULE_OWNER := ti
96include $(BUILD_PREBUILT)
97
98WPAN_BT_FW_FILES := $(addprefix $(LOCAL_PATH)/$(FW_BT_FULL_PATH)/, $(WPAN_BT_FW_BINS))
99.PHONY: $(WPAN_BT_FW_FILES)
100$(WPAN_BT_FW_FILES): $(FW_BT_FULL_PATH)
101 $(hide) tar -C $(FW_BT_PATH) --strip-components=2 \
102 -f $(WPAN_TGZ) -xzp wpan/bluetooth/$(notdir $@)
103
104$(FW_BT_FULL_PATH):
105 $(hide) mkdir -p $(FW_BT_PATH)
106
107endif
diff --git a/wl12xx/wpan/bluetooth/NOTICE b/wl12xx/wpan/bluetooth/NOTICE
deleted file mode 120000
index 8df64fe..0000000
--- a/wl12xx/wpan/bluetooth/NOTICE
+++ /dev/null
@@ -1 +0,0 @@
1../License_for_WPAN_Binary_Images.txt \ No newline at end of file
diff --git a/wl12xx/wpan/bluetooth/wl12xx-wpan-bt-fw-products.mk b/wl12xx/wpan/bluetooth/wl12xx-wpan-bt-fw-products.mk
deleted file mode 100644
index 56e62e8..0000000
--- a/wl12xx/wpan/bluetooth/wl12xx-wpan-bt-fw-products.mk
+++ /dev/null
@@ -1,26 +0,0 @@
1# Copyright (C) 2013 The Android Open Source Project
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14#
15
16# Add Bluetooth firmware
17
18PRODUCT_PACKAGES += \
19 TIInit_7.2.31.bts \
20 TIInit_7.6.15.bts \
21 TIInit_10.6.15.bts \
22 TIInit_11.8.32.bts \
23 TIInit_12.7.27.bts \
24 TIInit_12.8.32.bts \
25 TIInit_12.10.28.bts
26
diff --git a/wl12xx/wpan/wl12xx-wpan-fw-products.mk b/wl12xx/wpan/wl12xx-wpan-fw-products.mk
index 6009392..a04600c 100644
--- a/wl12xx/wpan/wl12xx-wpan-fw-products.mk
+++ b/wl12xx/wpan/wl12xx-wpan-fw-products.mk
@@ -13,6 +13,7 @@
13# limitations under the License. 13# limitations under the License.
14# 14#
15 15
16WPAN_FW_TOP := device/ti/proprietary-open/wl12xx/wpan 16WPAN_TGZ := device/ti/proprietary-open/wl12xx/wpan/wpan.tgz
17 17
18$(call inherit-product, $(WPAN_FW_TOP)/bluetooth/wl12xx-wpan-bt-fw-products.mk) 18PRODUCT_PACKAGES += \
19 TIInit_12.10.28.bts
diff --git a/wl12xx/wpan/wpan.tgz b/wl12xx/wpan/wpan.tgz
index 0baa29c..632e28a 100644
--- a/wl12xx/wpan/wpan.tgz
+++ b/wl12xx/wpan/wpan.tgz
Binary files differ