diff --git a/Android.mk b/Android.mk
index 009ccae858870fc3fe925bef2c999ffd9a51e6ce..59348999ad08343ae52c411906e9cb16e7469cc7 100644 (file)
--- a/Android.mk
+++ b/Android.mk
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
#############################################
$(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
#############################################
-include $(call all-subdir-makefiles)
+#############################################
+# Install Tesla-binary FW
+#############################################
+
+ifneq ($(TESLA_TGZ),)
+ti-tesla.untarred_intermediates := $(call intermediates-dir-for, FAKE, ti-tesla.untarred)
+ti-tesla.untarred_timestamp := $(ti-tesla.untarred_intermediates)/stamp
+
+$(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 := tesla-dsp.bin
+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-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
+
+#############################################