proprietary-open: wlan: move to tgz tarball
authorVishal Mahaveer <vishalm@ti.com>
Fri, 29 Jun 2012 17:09:17 +0000 (12:09 -0500)
committerVishal Mahaveer <vishalm@ti.com>
Thu, 26 Jul 2012 20:52:38 +0000 (15:52 -0500)
Move WLAN firmware from indvidual files to tar ball approach.
Based on the way ducati binaries are handled.

Change-Id: I66bfec1b0fb01f36a4508922d0e4919d6bb1eeb0
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Android.mk
wl12xx/wlan/wl1271-nvs.bin [deleted file]
wl12xx/wlan/wl1271-nvs_127x.bin [deleted file]
wl12xx/wlan/wl127x-fw-4-mr.bin [deleted file]
wl12xx/wlan/wl127x-fw-4-plt.bin [deleted file]
wl12xx/wlan/wl127x-fw-4-sr.bin [deleted file]
wl12xx/wlan/wl128x-fw-4-mr.bin [deleted file]
wl12xx/wlan/wl128x-fw-4-plt.bin [deleted file]
wl12xx/wlan/wl128x-fw-4-sr.bin [deleted file]
wl12xx/wlan/wl12xx-wlan-fw-products.mk
wl12xx/wlan/wlan.tgz [new file with mode: 0644]

index a1a60c4241d6b0af80014ed904c112f6d5f6872f..ce2221fddab3437fb100005943074e308b81bbcd 100644 (file)
@@ -31,3 +31,134 @@ $(LOCAL_BUILT_MODULE) : $(ti-ducati.untarred_timestamp) | $(ACP)
        $(hide) $(ACP) -fp $(PRIVATE_SRC) $@
 endif
 #############################################
+
+
+###############################################################################
+# 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
+
+$(wl12xx-wlan.untarred_timestamp) : $(WLAN_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_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) $@
+
+endif
+
+################################################################################
diff --git a/wl12xx/wlan/wl1271-nvs.bin b/wl12xx/wlan/wl1271-nvs.bin
deleted file mode 100644 (file)
index 28a0928..0000000
Binary files a/wl12xx/wlan/wl1271-nvs.bin and /dev/null differ
diff --git a/wl12xx/wlan/wl1271-nvs_127x.bin b/wl12xx/wlan/wl1271-nvs_127x.bin
deleted file mode 100644 (file)
index 3cb8a6c..0000000
Binary files a/wl12xx/wlan/wl1271-nvs_127x.bin and /dev/null differ
diff --git a/wl12xx/wlan/wl127x-fw-4-mr.bin b/wl12xx/wlan/wl127x-fw-4-mr.bin
deleted file mode 100755 (executable)
index f2301da..0000000
Binary files a/wl12xx/wlan/wl127x-fw-4-mr.bin and /dev/null differ
diff --git a/wl12xx/wlan/wl127x-fw-4-plt.bin b/wl12xx/wlan/wl127x-fw-4-plt.bin
deleted file mode 100755 (executable)
index f2f6dd8..0000000
Binary files a/wl12xx/wlan/wl127x-fw-4-plt.bin and /dev/null differ
diff --git a/wl12xx/wlan/wl127x-fw-4-sr.bin b/wl12xx/wlan/wl127x-fw-4-sr.bin
deleted file mode 100755 (executable)
index dece599..0000000
Binary files a/wl12xx/wlan/wl127x-fw-4-sr.bin and /dev/null differ
diff --git a/wl12xx/wlan/wl128x-fw-4-mr.bin b/wl12xx/wlan/wl128x-fw-4-mr.bin
deleted file mode 100755 (executable)
index 3861e67..0000000
Binary files a/wl12xx/wlan/wl128x-fw-4-mr.bin and /dev/null differ
diff --git a/wl12xx/wlan/wl128x-fw-4-plt.bin b/wl12xx/wlan/wl128x-fw-4-plt.bin
deleted file mode 100644 (file)
index 7305b92..0000000
Binary files a/wl12xx/wlan/wl128x-fw-4-plt.bin and /dev/null differ
diff --git a/wl12xx/wlan/wl128x-fw-4-sr.bin b/wl12xx/wlan/wl128x-fw-4-sr.bin
deleted file mode 100644 (file)
index b754a64..0000000
Binary files a/wl12xx/wlan/wl128x-fw-4-sr.bin and /dev/null differ
index a36c1c16ea62c59e48478ff21b507a31e03ed3d8..6b7671e499135b621db28ecc0f9724fdb522d0ef 100644 (file)
@@ -1,9 +1,29 @@
-PRODUCT_COPY_FILES += \
-        device/ti/proprietary-open/wl12xx/wlan/wl128x-fw-4-mr.bin:system/etc/firmware/ti-connectivity/wl128x-fw-4-mr.bin \
-        device/ti/proprietary-open/wl12xx/wlan/wl128x-fw-4-plt.bin:system/etc/firmware/ti-connectivity/wl128x-fw-4-plt.bin \
-        device/ti/proprietary-open/wl12xx/wlan/wl128x-fw-4-sr.bin:system/etc/firmware/ti-connectivity/wl128x-fw-4-sr.bin \
-        device/ti/proprietary-open/wl12xx/wlan/wl127x-fw-4-mr.bin:system/etc/firmware/ti-connectivity/wl127x-fw-4-mr.bin \
-        device/ti/proprietary-open/wl12xx/wlan/wl127x-fw-4-plt.bin:system/etc/firmware/ti-connectivity/wl127x-fw-4-plt.bin \
-        device/ti/proprietary-open/wl12xx/wlan/wl127x-fw-4-sr.bin:system/etc/firmware/ti-connectivity/wl127x-fw-4-sr.bin \
-        device/ti/proprietary-open/wl12xx/wlan/wl1271-nvs.bin:system/etc/firmware/ti-connectivity/wl1271-nvs.bin \
-        device/ti/proprietary-open/wl12xx/wlan/wl1271-nvs_127x.bin:system/etc/firmware/ti-connectivity/wl1271-nvs_127x.bin \
+# Copyright (C) 2012 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 WLAN firmware - Define the tgz to be unpacked, and enable the
+# WLAN firmware package, which is defined in the top-level Android.mk
+# of the proprietary-open tree
+
+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 \
+        wl1271-nvs.bin \
+        wl1271-nvs_127x.bin
diff --git a/wl12xx/wlan/wlan.tgz b/wl12xx/wlan/wlan.tgz
new file mode 100644 (file)
index 0000000..4aab5bf
Binary files /dev/null and b/wl12xx/wlan/wlan.tgz differ