wl18xx: wlan: update firmware for version R8.4

[android-sdk/device-ti-proprietary-open.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index ce2221fddab3437fb100005943074e308b81bbcd..59348999ad08343ae52c411906e9cb16e7469cc7 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,9 +1,18 @@
 LOCAL_PATH := $(my-dir)
-$(hide $(shell $(LOCAL_PATH)/untar.sh $(LOCAL_PATH)/omap4 sgx $(LOCAL_PATH)/omap4/sgx.tgz))
-$(hide $(shell $(LOCAL_PATH)/untar.sh $(LOCAL_PATH)/wl12xx wpan $(LOCAL_PATH)/wl12xx/wpan.tgz))
+img-sgx.untarred_intermediates := $(call intermediates-dir-for, FAKE, img-sgx.untarred)
+img-sgx.untarred_timestamp := $(img-sgx.untarred_intermediates)/stamp
+img-sgx.untarred_bin := $(img-sgx.untarred_intermediates)/sgx
+img-sgx.tar := $(LOCAL_PATH)/$(TARGET_BOARD_PLATFORM)/sgx.tgz
 
 include $(call all-subdir-makefiles)
 
+$(img-sgx.untarred_timestamp) : $(img-sgx.tar)
+       @echo "Unzip $(dir $@) <- $<"
+       $(hide) rm -rf $(dir $@) && mkdir -p $(dir $@)
+       $(hide) tar -C $(dir $@) -xzf $<
+       $(hide) touch $@
+
+
 # Install Ducati from the TGZ defined in the device-inherited mk file
 #############################################
 ifneq ($(DUCATI_TGZ),)
@@ -17,14 +26,14 @@ $(ti-ducati.untarred_timestamp) : $(DUCATI_TGZ)
        $(hide) touch $@
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := ducati-m3.bin
+LOCAL_MODULE := $(DUCATI_BINARY)
 LOCAL_MODULE_CLASS := FAKE
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/firmware
 
 include $(BUILD_SYSTEM)/base_rules.mk
 
-$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(ti-ducati.untarred_intermediates)/ducati-m3.bin
+$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(ti-ducati.untarred_intermediates)/$(DUCATI_BINARY)
 $(LOCAL_BUILT_MODULE) : $(ti-ducati.untarred_timestamp) | $(ACP)
        @echo "Copy $@ <- $(PRIVATE_SRC)"
        @mkdir -p $(dir $@)
@@ -32,133 +41,33 @@ $(LOCAL_BUILT_MODULE) : $(ti-ducati.untarred_timestamp) | $(ACP)
 endif
 #############################################
 
+#############################################
+# Install Tesla-binary FW
+#############################################
 
-###############################################################################
-# Install WLAN firmware files
-###############################################################################
-
-ifneq ($(WLAN_TGZ),)
-wl12xx-wlan.untarred_intermediates := $(call intermediates-dir-for, FAKE, wl12xx-wlan.untarred)
-wl12xx-wlan.untarred_timestamp := $(wl12xx-wlan.untarred_intermediates)/stamp
+ifneq ($(TESLA_TGZ),)
+ti-tesla.untarred_intermediates := $(call intermediates-dir-for, FAKE, ti-tesla.untarred)
+ti-tesla.untarred_timestamp := $(ti-tesla.untarred_intermediates)/stamp
 
-$(wl12xx-wlan.untarred_timestamp) : $(WLAN_TGZ)
+$(ti-tesla.untarred_timestamp) : $(TESLA_TGZ)
        @echo "Unzip $(dir $@) <- $<)"
        $(hide) rm -rf $(dir $@) && mkdir -p $(dir $@)
        $(hide) tar -C $(dir $@) -zxf $<
        $(hide) touch $@
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := wl1271-nvs.bin
-LOCAL_MODULE_CLASS := FAKE
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware/ti-connectivity
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(wl12xx-wlan.untarred_intermediates)/wlan/wl1271-nvs.bin
-$(LOCAL_BUILT_MODULE) : $(wl12xx-wlan.untarred_timestamp) | $(ACP)
-       @echo "Copy $@ <- $(PRIVATE_SRC)"
-       @mkdir -p $(dir $@)
-       $(hide) $(ACP) -fp $(PRIVATE_SRC) $@
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := wl1271-nvs_127x.bin
-LOCAL_MODULE_CLASS := FAKE
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware/ti-connectivity
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(wl12xx-wlan.untarred_intermediates)/wlan/wl1271-nvs_127x.bin
-$(LOCAL_BUILT_MODULE) : $(wl12xx-wlan.untarred_timestamp) | $(ACP)
-       @echo "Copy $@ <- $(PRIVATE_SRC)"
-       @mkdir -p $(dir $@)
-       $(hide) $(ACP) -fp $(PRIVATE_SRC) $@
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := wl128x-fw-4-sr.bin
-LOCAL_MODULE_CLASS := FAKE
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware/ti-connectivity
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(wl12xx-wlan.untarred_intermediates)/wlan/wl128x-fw-4-sr.bin
-$(LOCAL_BUILT_MODULE) : $(wl12xx-wlan.untarred_timestamp) | $(ACP)
-       @echo "Copy $@ <- $(PRIVATE_SRC)"
-       @mkdir -p $(dir $@)
-       $(hide) $(ACP) -fp $(PRIVATE_SRC) $@
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := wl128x-fw-4-mr.bin
-LOCAL_MODULE_CLASS := FAKE
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware/ti-connectivity
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(wl12xx-wlan.untarred_intermediates)/wlan/wl128x-fw-4-mr.bin
-$(LOCAL_BUILT_MODULE) : $(wl12xx-wlan.untarred_timestamp) | $(ACP)
-       @echo "Copy $@ <- $(PRIVATE_SRC)"
-       @mkdir -p $(dir $@)
-       $(hide) $(ACP) -fp $(PRIVATE_SRC) $@
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := wl128x-fw-4-plt.bin
-LOCAL_MODULE_CLASS := FAKE
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware/ti-connectivity
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(wl12xx-wlan.untarred_intermediates)/wlan/wl128x-fw-4-plt.bin
-$(LOCAL_BUILT_MODULE) : $(wl12xx-wlan.untarred_timestamp) | $(ACP)
-       @echo "Copy $@ <- $(PRIVATE_SRC)"
-       @mkdir -p $(dir $@)
-       $(hide) $(ACP) -fp $(PRIVATE_SRC) $@
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := wl127x-fw-4-sr.bin
-LOCAL_MODULE_CLASS := FAKE
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware/ti-connectivity
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(wl12xx-wlan.untarred_intermediates)/wlan/wl127x-fw-4-sr.bin
-$(LOCAL_BUILT_MODULE) : $(wl12xx-wlan.untarred_timestamp) | $(ACP)
-       @echo "Copy $@ <- $(PRIVATE_SRC)"
-       @mkdir -p $(dir $@)
-       $(hide) $(ACP) -fp $(PRIVATE_SRC) $@
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := wl127x-fw-4-mr.bin
-LOCAL_MODULE_CLASS := FAKE
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware/ti-connectivity
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(wl12xx-wlan.untarred_intermediates)/wlan/wl127x-fw-4-mr.bin
-$(LOCAL_BUILT_MODULE) : $(wl12xx-wlan.untarred_timestamp) | $(ACP)
-       @echo "Copy $@ <- $(PRIVATE_SRC)"
-       @mkdir -p $(dir $@)
-       $(hide) $(ACP) -fp $(PRIVATE_SRC) $@
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := wl127x-fw-4-plt.bin
+LOCAL_MODULE := tesla-dsp.bin
 LOCAL_MODULE_CLASS := FAKE
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware/ti-connectivity
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/firmware
 
 include $(BUILD_SYSTEM)/base_rules.mk
 
-$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(wl12xx-wlan.untarred_intermediates)/wlan/wl127x-fw-4-plt.bin
-$(LOCAL_BUILT_MODULE) : $(wl12xx-wlan.untarred_timestamp) | $(ACP)
+$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(ti-tesla.untarred_intermediates)/tesla-dsp.bin
+$(LOCAL_BUILT_MODULE) : $(ti-tesla.untarred_timestamp) | $(ACP)
        @echo "Copy $@ <- $(PRIVATE_SRC)"
        @mkdir -p $(dir $@)
        $(hide) $(ACP) -fp $(PRIVATE_SRC) $@
-
 endif
 
-################################################################################
+#############################################