wl12xx: cleanup: remove NFC and FM WiLink firmware files

Change-Id: I5b880a09bcf1daa4957e4710b8c50870ddcaea21
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>

diff --git a/wl12xx/wpan/fm/Android.mk b/wl12xx/wpan/fm/Android.mk
deleted file mode 100644 (file)
index caa7690..0000000
--- a/wl12xx/wpan/fm/Android.mk
+++ /dev/null
@@ -1,204 +0,0 @@
-# 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
deleted file mode 100644 (file)
index 43d11e7..0000000
--- a/wl12xx/wpan/fm/wl12xx-wpan-fm-fw-products.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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
deleted file mode 100644 (file)
index 6929d13..0000000
--- a/wl12xx/wpan/nfc/Android.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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
deleted file mode 100644 (file)
index 9c54ea6..0000000
--- a/wl12xx/wpan/nfc/wl12xx-wpan-nfc-fw-products.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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
index 9a919b8d000a08e84930ca5713fcfbc42b239f7d..6009392bfef4569cd0860afaad80adc0ffa41339 100644 (file)
--- a/wl12xx/wpan/wl12xx-wpan-fw-products.mk
+++ b/wl12xx/wpan/wl12xx-wpan-fw-products.mk
@@ -16,5 +16,3 @@
 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/wpan.tgz b/wl12xx/wpan/wpan.tgz
index 5aaf925e83babc6d87c17d438335a86f1d2a3cd8..ae31677b923921668a124e63bb6156a2091429fe 100644 (file)
Binary files a/wl12xx/wpan/wpan.tgz and b/wl12xx/wpan/wpan.tgz differ