wpan: rework rules for wpan firmware binaries

Organize prebuilt firmware binaries for WiLink's modules
as regular Android prebuilts. Move corresponding rules to
separate makefile.

Change-Id: Ibc8b3531084530cda1388db15a5ab7b3fdec54bc
Signed-off-by: Andrii Beregovenko <a.beregovenko@ti.com>

diff --git a/Android.mk b/Android.mk
index 26a1a6b521d6696ad05e725c619a42bc63d48d5b..ecdaafa10aa92b6582484eb25bf94c4f26b5569a 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -71,34 +71,3 @@ $(LOCAL_BUILT_MODULE) : $(ti-tesla.untarred_timestamp) | $(ACP)
 endif
 
 #############################################
-
-################################################################################
-# Install WPAN firmware files
-###############################################################################
-WPAN_TGZ := device/ti/proprietary-open/wl12xx/wpan.tgz
-
-ifneq ($(WPAN_TGZ),)
-include $(CLEAR_VARS)
-
-wpan.untarred_intermediates := $(call intermediates-dir-for, FAKE, wpan.untarred)
-wpan.untarred_timestamp := $(wpan.untarred_intermediates)/stamp
-
-WPAN_FW_LOCAL_PATH:= device/ti/proprietary-open/wl12xx/
-LOCAL_MODULE := ti-wpan-fw
-LOCAL_MODULE_CLASS := FAKE
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE) : $(WPAN_TGZ)
-       echo "Unzip $(wpan.untarred_intermediates) <- $<"
-       $(hide) rm -rvf $(wpan.untarred_intermediates)/wpan
-       $(hide) mkdir -p $(wpan.untarred_intermediates)
-       $(hide) tar -C $(wpan.untarred_intermediates) -zvxf $<
-       $(hide) touch $(wpan.untarred_intermediates)
-
-$(LOCAL_INSTALLED_MODULE) : $(LOCAL_BUILT_MODULE) | $(ACP)
-       @echo "Copying wpan firmware ..."
-       @mkdir -p $(PRODUCT_OUT)/system/etc/firmware
-       $(hide) $(ACP) -rfpv $(wpan.untarred_intermediates)/wpan/*/*.bts $(PRODUCT_OUT)/system/etc/firmware/
-endif

diff --git a/wl12xx/wpan/Android.mk b/wl12xx/wpan/Android.mk
new file mode 100644 (file)
index 0000000..a47f6c0
--- /dev/null
+++ b/wl12xx/wpan/Android.mk
@@ -0,0 +1,20 @@
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+WPAN_TGZ := device/ti/proprietary-open/wl12xx/wpan/wpan.tgz
+
+include $(call all-makefiles-under, $(LOCAL_PATH))

diff --git a/wl12xx/License_for_WPAN_Binary_Images.txt b/wl12xx/wpan/License_for_WPAN_Binary_Images.txt
similarity index 100%
rename from wl12xx/License_for_WPAN_Binary_Images.txt
rename to wl12xx/wpan/License_for_WPAN_Binary_Images.txt

diff --git a/wl12xx/wpan/bluetooth/Android.mk b/wl12xx/wpan/bluetooth/Android.mk
new file mode 100644 (file)
index 0000000..db63840
--- /dev/null
+++ b/wl12xx/wpan/bluetooth/Android.mk
@@ -0,0 +1,96 @@
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+ifeq ($(strip $(BOARD_HAVE_BLUETOOTH_TI)),true)
+
+TI_WILINK_BT_FW_PATH := $(TARGET_OUT_ETC)/firmware
+
+WPAN_BT_FW_BINS := \
+       TIInit_7.2.31.bts \
+       TIInit_7.6.15.bts \
+       TIInit_10.6.15.bts \
+       TIInit_11.8.32.bts \
+       TIInit_12.7.27.bts \
+       TIInit_12.8.32.bts
+
+# path to BT fws (related to top dir)
+FW_BT_PATH := $(TARGET_EXTRACTED_FW)/bt
+
+# path related to current location
+FW_BT_FULL_PATH := ../../../../../../$(FW_BT_PATH)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := TIInit_7.2.31.bts
+LOCAL_SRC_FILES := $(FW_BT_FULL_PATH)/TIInit_7.2.31.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_BT_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+include $(CLEAR_VARS)
+LOCAL_MODULE := TIInit_7.6.15.bts
+LOCAL_SRC_FILES := $(FW_BT_FULL_PATH)/TIInit_7.6.15.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_BT_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := TIInit_10.6.15.bts
+LOCAL_SRC_FILES := $(FW_BT_FULL_PATH)/TIInit_10.6.15.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_BT_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := TIInit_11.8.32.bts
+LOCAL_SRC_FILES := $(FW_BT_FULL_PATH)/TIInit_11.8.32.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_BT_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := TIInit_12.7.27.bts
+LOCAL_SRC_FILES := $(FW_BT_FULL_PATH)/TIInit_12.7.27.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_BT_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+include $(CLEAR_VARS)
+LOCAL_MODULE := TIInit_12.8.32.bts
+LOCAL_SRC_FILES := $(FW_BT_FULL_PATH)/TIInit_12.8.32.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_BT_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+WPAN_BT_FW_FILES := $(addprefix $(LOCAL_PATH)/$(FW_BT_FULL_PATH)/, $(WPAN_BT_FW_BINS))
+.PHONY: $(WPAN_BT_FW_FILES)
+$(WPAN_BT_FW_FILES): $(FW_BT_FULL_PATH)
+       $(hide) tar -C $(FW_BT_PATH) --strip-components=2 \
+               -f $(WPAN_TGZ) -xzp wpan/bluetooth/$(notdir $@)
+
+$(FW_BT_FULL_PATH):
+       $(hide) mkdir -p $(FW_BT_PATH)
+
+endif

diff --git a/wl12xx/wpan/bluetooth/wl12xx-wpan-bt-fw-products.mk b/wl12xx/wpan/bluetooth/wl12xx-wpan-bt-fw-products.mk
new file mode 100644 (file)
index 0000000..1a73115
--- /dev/null
+++ b/wl12xx/wpan/bluetooth/wl12xx-wpan-bt-fw-products.mk
@@ -0,0 +1,24 @@
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Add Bluetooth firmware
+
+PRODUCT_PACKAGES += \
+       TIInit_7.2.31.bts \
+       TIInit_7.6.15.bts \
+       TIInit_10.6.15.bts \
+       TIInit_11.8.32.bts \
+       TIInit_12.7.27.bts \
+       TIInit_12.8.32.bts
\ No newline at end of file

diff --git a/wl12xx/wpan/fm/Android.mk b/wl12xx/wpan/fm/Android.mk
new file mode 100644 (file)
index 0000000..caa7690
--- /dev/null
+++ b/wl12xx/wpan/fm/Android.mk
@@ -0,0 +1,204 @@
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+TI_WILINK_FM_FW_PATH := $(TARGET_OUT_ETC)/firmware
+
+WPAN_FM_FW_BINS := \
+       fmc_ch8_1283.2.bts \
+       fmc_ch8_1853.3.bts \
+       fmc_ch8_1893.2.bts \
+       fmc_ch8_1893.3.bts \
+       fmc_init_1273.2.bts \
+       fm_rx_ch8_1283.2.bts \
+       fm_rx_ch8_1853.3.bts \
+       fm_rx_ch8_1893.2.bts \
+       fm_rx_ch8_1893.3.bts \
+       fm_rx_init_1273.2.bts \
+       fm_tx_ch8_1273.1.bts \
+       fm_tx_ch8_1273.2.bts \
+       fm_tx_ch8_1283.2.bts \
+       fm_tx_ch8_1853.3.bts \
+       fm_tx_ch8_1893.2.bts \
+       fm_tx_ch8_1893.3.bts \
+       fm_tx_init_1273.2.bts
+
+# path to NFC fws (related to top dir)
+FW_FM_PATH := $(TARGET_EXTRACTED_FW)/fm
+
+# path related to current location
+FW_FM_FULL_PATH := ../../../../../../$(FW_FM_PATH)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fmc_ch8_1283.2.bts
+LOCAL_SRC_FILES := $(FW_FM_FULL_PATH)/fmc_ch8_1283.2.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_FM_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fmc_ch8_1853.3.bts
+LOCAL_SRC_FILES := $(FW_FM_FULL_PATH)/fmc_ch8_1853.3.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_FM_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fmc_ch8_1893.2.bts
+LOCAL_SRC_FILES := $(FW_FM_FULL_PATH)/fmc_ch8_1893.2.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_FM_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fmc_ch8_1893.3.bts
+LOCAL_SRC_FILES := $(FW_FM_FULL_PATH)/fmc_ch8_1893.3.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_FM_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fmc_init_1273.2.bts
+LOCAL_SRC_FILES := $(FW_FM_FULL_PATH)/fmc_init_1273.2.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_FM_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fm_rx_ch8_1283.2.bts
+LOCAL_SRC_FILES := $(FW_FM_FULL_PATH)/fm_rx_ch8_1283.2.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_FM_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fm_rx_ch8_1853.3.bts
+LOCAL_SRC_FILES := $(FW_FM_FULL_PATH)/fm_rx_ch8_1853.3.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_FM_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fm_rx_ch8_1893.2.bts
+LOCAL_SRC_FILES := $(FW_FM_FULL_PATH)/fm_rx_ch8_1893.2.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_FM_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fm_rx_ch8_1893.3.bts
+LOCAL_SRC_FILES := $(FW_FM_FULL_PATH)/fm_rx_ch8_1893.3.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_FM_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fm_rx_init_1273.2.bts
+LOCAL_SRC_FILES := $(FW_FM_FULL_PATH)/fm_rx_init_1273.2.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_FM_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fm_tx_ch8_1273.1.bts
+LOCAL_SRC_FILES := $(FW_FM_FULL_PATH)/fm_tx_ch8_1273.1.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_FM_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fm_tx_ch8_1273.2.bts
+LOCAL_SRC_FILES := $(FW_FM_FULL_PATH)/fm_tx_ch8_1273.2.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_FM_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fm_tx_ch8_1283.2.bts
+LOCAL_SRC_FILES := $(FW_FM_FULL_PATH)/fm_tx_ch8_1283.2.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_FM_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fm_tx_ch8_1853.3.bts
+LOCAL_SRC_FILES := $(FW_FM_FULL_PATH)/fm_tx_ch8_1853.3.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_FM_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fm_tx_ch8_1893.2.bts
+LOCAL_SRC_FILES := $(FW_FM_FULL_PATH)/fm_tx_ch8_1893.2.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_FM_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fm_tx_ch8_1893.3.bts
+LOCAL_SRC_FILES := $(FW_FM_FULL_PATH)/fm_tx_ch8_1893.3.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_FM_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fm_tx_init_1273.2.bts
+LOCAL_SRC_FILES := $(FW_FM_FULL_PATH)/fm_tx_init_1273.2.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_FM_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+WPAN_FM_FW_FILES := $(addprefix $(LOCAL_PATH)/$(FW_FM_FULL_PATH)/, $(WPAN_FM_FW_BINS))
+.PHONY: $(WPAN_FM_FW_FILES)
+$(WPAN_FM_FW_FILES): $(FW_FM_FULL_PATH)
+       $(hide) tar -C $(FW_FM_PATH) --strip-components=2 \
+               -f $(WPAN_TGZ) -xzp wpan/fmradio/$(notdir $@)
+
+$(FW_FM_FULL_PATH):
+       $(hide) mkdir -p $(FW_FM_PATH)

diff --git a/wl12xx/wpan/fm/wl12xx-wpan-fm-fw-products.mk b/wl12xx/wpan/fm/wl12xx-wpan-fm-fw-products.mk
new file mode 100644 (file)
index 0000000..43d11e7
--- /dev/null
+++ b/wl12xx/wpan/fm/wl12xx-wpan-fm-fw-products.mk
@@ -0,0 +1,35 @@
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Add FM radio firmware
+
+PRODUCT_PACKAGES += \
+       fmc_ch8_1283.2.bts \
+       fmc_ch8_1853.3.bts \
+       fmc_ch8_1893.2.bts \
+       fmc_ch8_1893.3.bts \
+       fmc_init_1273.2.bts \
+       fm_rx_ch8_1283.2.bts \
+       fm_rx_ch8_1853.3.bts \
+       fm_rx_ch8_1893.2.bts \
+       fm_rx_ch8_1893.3.bts \
+       fm_rx_init_1273.2.bts \
+       fm_tx_ch8_1273.1.bts \
+       fm_tx_ch8_1273.2.bts \
+       fm_tx_ch8_1283.2.bts \
+       fm_tx_ch8_1853.3.bts \
+       fm_tx_ch8_1893.2.bts \
+       fm_tx_ch8_1893.3.bts \
+       fm_tx_init_1273.2.bts
\ No newline at end of file

diff --git a/wl12xx/wpan/nfc/Android.mk b/wl12xx/wpan/nfc/Android.mk
new file mode 100644 (file)
index 0000000..6929d13
--- /dev/null
+++ b/wl12xx/wpan/nfc/Android.mk
@@ -0,0 +1,69 @@
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+ifeq ($(strip $(NFC_TI_DEVICE)),true)
+
+TI_WILINK_NFC_FW_PATH := $(TARGET_OUT_ETC)/firmware
+
+WPAN_NFC_FW_BINS := \
+       TIInit_11.7.27.bts \
+       TINfcInit_12.8.32.72.bts \
+       TINfcInit_12.8.32.80.bts
+
+# path to NFC fws (related to top dir)
+FW_NFC_PATH := $(TARGET_EXTRACTED_FW)/nfc
+
+# path related to current location
+FW_NFC_FULL_PATH := ../../../../../../$(FW_NFC_PATH)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := TIInit_11.7.27.bts
+LOCAL_SRC_FILES := $(FW_NFC_FULL_PATH)/TIInit_11.7.27.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_NFC_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := TINfcInit_12.8.32.72.bts
+LOCAL_SRC_FILES := $(FW_NFC_FULL_PATH)/TINfcInit_12.8.32.72.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_NFC_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := TINfcInit_12.8.32.80.bts
+LOCAL_SRC_FILES := $(FW_NFC_FULL_PATH)/TINfcInit_12.8.32.80.bts
+LOCAL_MODULE_CLASS := FIRMWARE
+LOCAL_MODULE_PATH := $(TI_WILINK_NFC_FW_PATH)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := ti
+include $(BUILD_PREBUILT)
+
+WPAN_NFC_FW_FILES := $(addprefix $(LOCAL_PATH)/$(FW_NFC_FULL_PATH)/, $(WPAN_NFC_FW_BINS))
+.PHONY: $(WPAN_NFC_FW_FILES)
+$(WPAN_NFC_FW_FILES): $(FW_NFC_FULL_PATH)
+       $(hide) tar -C $(FW_NFC_PATH) --strip-components=2 \
+               -f $(WPAN_TGZ) -xzp wpan/nfc/$(notdir $@)
+
+$(FW_NFC_FULL_PATH):
+       $(hide) mkdir -p $(FW_NFC_PATH)
+
+endif
+

diff --git a/wl12xx/wpan/nfc/wl12xx-wpan-nfc-fw-products.mk b/wl12xx/wpan/nfc/wl12xx-wpan-nfc-fw-products.mk
new file mode 100644 (file)
index 0000000..9c54ea6
--- /dev/null
+++ b/wl12xx/wpan/nfc/wl12xx-wpan-nfc-fw-products.mk
@@ -0,0 +1,18 @@
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+PRODUCT_PACKAGES += \
+       TIInit_11.7.27.bts \
+       TINfcInit_12.8.32.72.bts \
+       TINfcInit_12.8.32.80.bts
\ No newline at end of file

diff --git a/wl12xx/wpan/wl12xx-wpan-fw-products.mk b/wl12xx/wpan/wl12xx-wpan-fw-products.mk
new file mode 100644 (file)
index 0000000..9a919b8
--- /dev/null
+++ b/wl12xx/wpan/wl12xx-wpan-fw-products.mk
@@ -0,0 +1,20 @@
+# Copyright (C) 2012 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+WPAN_FW_TOP := device/ti/proprietary-open/wl12xx/wpan
+
+$(call inherit-product, $(WPAN_FW_TOP)/bluetooth/wl12xx-wpan-bt-fw-products.mk)
+$(call inherit-product, $(WPAN_FW_TOP)/fm/wl12xx-wpan-fm-fw-products.mk)
+$(call inherit-product, $(WPAN_FW_TOP)/nfc/wl12xx-wpan-nfc-fw-products.mk)

diff --git a/wl12xx/wpan.tgz b/wl12xx/wpan/wpan.tgz
similarity index 100%
rename from wl12xx/wpan.tgz
rename to wl12xx/wpan/wpan.tgz