proprietary-open: rule to install wpan fw

Use this rule to install all wpan related firmware files.
The wpan archive needs to maintain the folder structure of
wl12xx/wpan/<technology>/.bts

Patch modified from original - Mark Lifshits <lifshitsm@ti.com>
Signed-off-by: Pavan Savoy <pavan_savoy@ti.com>
Modified to install only in the intermediates directory, and not to
remove artifacts from the intermediates directory.

Change-Id: I26a0669eea1a7b7b26ad6a2a780ad0d098f477d0
Signed-off-by: James W. Mills <jameswmills@ti.com>

diff --git a/Android.mk b/Android.mk
index 96a5cf373f2d1f7c219ce59166fddff99e40397c..1f389908319aa368bab9e1ff910320d4921692fd 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,8 +4,6 @@ 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
 
-$(hide $(shell $(LOCAL_PATH)/untar.sh $(LOCAL_PATH)/wl12xx wpan $(LOCAL_PATH)/wl12xx/wpan.tgz))
-
 include $(call all-subdir-makefiles)
 
 $(img-sgx.untarred_timestamp) : $(img-sgx.tar)
@@ -173,3 +171,32 @@ $(LOCAL_BUILT_MODULE) : $(wl12xx-wlan.untarred_timestamp) | $(ACP)
 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

diff --git a/wl12xx/License_for_WPAN_Binary_Images.txt b/wl12xx/License_for_WPAN_Binary_Images.txt
new file mode 100644 (file)
index 0000000..606c12d
--- /dev/null
+++ b/wl12xx/License_for_WPAN_Binary_Images.txt
@@ -0,0 +1,46 @@
+   1 TECHNOLOGY AND SOFTWARE PUBLICLY AVAILABLE
+   2 SOFTWARE LICENSE
+   3
+   4 Copyright (c) 2011, Texas Instruments Incorporated.
+   5
+   6 All rights reserved.
+   7
+   8 Redistribution.
+   9
+  10 Redistribution and use in binary form, without modification, are
+  11 permitted provided that the following conditions are met:
+  12
+  13  * Redistributions must preserve existing copyright notices and reproduce
+  14    this license (including the above copyright notice and the disclaimer below)
+  15    in the documentation and/or other materials provided with the distribution.
+  16
+  17  * Neither the name of Texas Instruments Incorporated nor the names of
+  18    its suppliers may be used to endorse or promote products derived
+  19    from this software without specific prior written permission.
+  20
+  21  * No reverse engineering, decompilation, or disassembly of this
+  22    software is permitted.
+  23
+  24 Limited patent license.
+  25
+  26 Texas Instruments Incorporated grants a world-wide, royalty-free,
+  27 non-exclusive license under patents it now or hereafter owns or controls
+  28 to make, have made, use, import, offer to sell and sell ("Utilize") this
+  29 software, but solely to the extent that any such patent is necessary
+  30 to Utilize the software alone.  The patent license shall not apply to
+  31 any combinations which include this software.  No hardware per se is
+  32 licensed hereunder.
+  33
+  34 DISCLAIMER.
+  35
+  36 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  37 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  38 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  39 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  40 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  41 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  42 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  43 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  44 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  45 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  46 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

diff --git a/wl12xx/wpan.tgz b/wl12xx/wpan.tgz
index fe3b7c9467797e53ce729be415302f2222b804a2..243b8fbb154d2760f76e2959215d74673d4dec66 100644 (file)
Binary files a/wl12xx/wpan.tgz and b/wl12xx/wpan.tgz differ