wlan: cleanup: remove legacy firmware files
authorVishal Mahaveer <vishalm@ti.com>
Thu, 17 Oct 2013 22:12:14 +0000 (17:12 -0500)
committerVishal Mahaveer <vishalm@ti.com>
Thu, 17 Oct 2013 22:12:14 +0000 (17:12 -0500)
Remove legacy firmware files from build system.

Change-Id: Ib9ef9ea3ee65e1ba19b4634aaf7474413efed2bd
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
wl12xx/wlan/Android.mk
wl12xx/wlan/wl12xx-wlan-fw-products.mk
wl12xx/wlan/wlan.tgz

index 30465f74c446dfb6791965e61f0277b74304c620..20178222f165ab5c404e528cb5575f11a43adf1f 100644 (file)
@@ -19,16 +19,8 @@ ifeq ($(strip $(BOARD_WLAN_DEVICE)),wl12xx_mac80211)
 TI_WILINK_FW_PATH := $(TARGET_OUT_ETC)/firmware/ti-connectivity
 
 WLAN_FW_BINS := \
-       wl128x-fw-4-mr.bin \
-       wl128x-fw-4-plt.bin \
-       wl128x-fw-4-sr.bin \
-       wl127x-fw-4-mr.bin \
-       wl127x-fw-4-plt.bin \
-       wl127x-fw-4-sr.bin \
        wl18xx-fw-mc.bin \
-       wl18xx-conf.bin \
-       wl1271-nvs.bin \
-       wl1271-nvs_127x.bin
+       wl18xx-conf.bin
 
 # path to FM fws (related to top dir)
 FW_WLAN_PATH := $(TARGET_EXTRACTED_FW)/wlan
@@ -36,56 +28,6 @@ FW_WLAN_PATH := $(TARGET_EXTRACTED_FW)/wlan
 # path related to current location
 FW_WLAN_FULL_PATH := ../../../../../$(FW_WLAN_PATH)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := wl128x-fw-4-mr.bin
-LOCAL_SRC_FILES := $(FW_WLAN_FULL_PATH)/wl128x-fw-4-mr.bin
-LOCAL_MODULE_CLASS := FIRMWARE
-LOCAL_MODULE_PATH := $(TI_WILINK_FW_PATH)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := ti
-include $(BUILD_PREBUILT)
-include $(CLEAR_VARS)
-LOCAL_MODULE := wl128x-fw-4-plt.bin
-LOCAL_SRC_FILES := $(FW_WLAN_FULL_PATH)/wl128x-fw-4-plt.bin
-LOCAL_MODULE_CLASS := FIRMWARE
-LOCAL_MODULE_PATH := $(TI_WILINK_FW_PATH)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := ti
-include $(BUILD_PREBUILT)
-include $(CLEAR_VARS)
-LOCAL_MODULE := wl128x-fw-4-sr.bin
-LOCAL_SRC_FILES := $(FW_WLAN_FULL_PATH)/wl128x-fw-4-sr.bin
-LOCAL_MODULE_CLASS := FIRMWARE
-LOCAL_MODULE_PATH := $(TI_WILINK_FW_PATH)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := ti
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := wl127x-fw-4-mr.bin
-LOCAL_SRC_FILES := $(FW_WLAN_FULL_PATH)/wl127x-fw-4-mr.bin
-LOCAL_MODULE_CLASS := FIRMWARE
-LOCAL_MODULE_PATH := $(TI_WILINK_FW_PATH)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := ti
-include $(BUILD_PREBUILT)
-include $(CLEAR_VARS)
-LOCAL_MODULE := wl127x-fw-4-plt.bin
-LOCAL_SRC_FILES := $(FW_WLAN_FULL_PATH)/wl127x-fw-4-plt.bin
-LOCAL_MODULE_CLASS := FIRMWARE
-LOCAL_MODULE_PATH := $(TI_WILINK_FW_PATH)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := ti
-include $(BUILD_PREBUILT)
-include $(CLEAR_VARS)
-LOCAL_MODULE := wl127x-fw-4-sr.bin
-LOCAL_SRC_FILES := $(FW_WLAN_FULL_PATH)/wl127x-fw-4-sr.bin
-LOCAL_MODULE_CLASS := FIRMWARE
-LOCAL_MODULE_PATH := $(TI_WILINK_FW_PATH)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := ti
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := wl18xx-fw-mc.bin
 LOCAL_SRC_FILES := $(FW_WLAN_FULL_PATH)/wl18xx-fw-mc.bin
@@ -103,23 +45,6 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_OWNER := ti
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := wl1271-nvs.bin
-LOCAL_SRC_FILES := $(FW_WLAN_FULL_PATH)/wl1271-nvs.bin
-LOCAL_MODULE_CLASS := FIRMWARE
-LOCAL_MODULE_PATH := $(TI_WILINK_FW_PATH)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := ti
-include $(BUILD_PREBUILT)
-include $(CLEAR_VARS)
-LOCAL_MODULE := wl1271-nvs_127x.bin
-LOCAL_SRC_FILES := $(FW_WLAN_FULL_PATH)/wl1271-nvs_127x.bin
-LOCAL_MODULE_CLASS := FIRMWARE
-LOCAL_MODULE_PATH := $(TI_WILINK_FW_PATH)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_OWNER := ti
-include $(BUILD_PREBUILT)
-
 WLAN_FW_FILES := $(addprefix $(LOCAL_PATH)/$(FW_WLAN_FULL_PATH)/, $(WLAN_FW_BINS))
 .PHONY: $(WLAN_FW_FILES)
 $(WLAN_FW_FILES): $(FW_WLAN_FULL_PATH)
index a62f71b0d6f3efed7aeb256ef828274fbdc4b473..f7f8bd948547ea85b549c068f30c976a034bc50e 100644 (file)
 
 WLAN_TGZ := device/ti/proprietary-open/wl12xx/wlan/wlan.tgz
 PRODUCT_PACKAGES += \
-        wl128x-fw-4-mr.bin \
-        wl128x-fw-4-plt.bin \
-        wl128x-fw-4-sr.bin \
-        wl127x-fw-4-mr.bin \
-        wl127x-fw-4-plt.bin \
-        wl127x-fw-4-sr.bin \
        wl18xx-fw-mc.bin \
-       wl18xx-conf.bin \
-        wl1271-nvs.bin \
-        wl1271-nvs_127x.bin
+       wl18xx-conf.bin
index 814d7188ec9d0758d61e449319eeb42004312881..73e08eb895b1fde41a71397c40c69ac126c3db8a 100644 (file)
Binary files a/wl12xx/wlan/wlan.tgz and b/wl12xx/wlan/wlan.tgz differ