diff --git a/Android.mk b/Android.mk
index 90a9bcf2cd889d12103290de3341ca97ebd57e21..59348999ad08343ae52c411906e9cb16e7469cc7 100644 (file)
--- a/Android.mk
+++ b/Android.mk
$(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 $@)
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 := tesla-dsp.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_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-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 := wl18xx-fw-mc.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/wl18xx-fw-mc.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 := wl18xx-conf.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/wl18xx-conf.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
-################################################################################
-# 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
+#############################################