diff options
author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2016-02-12 12:17:31 +0000 |
---|---|---|
committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2016-02-12 12:30:45 +0000 |
commit | 4c73b4a61614dd359207665967b8461a04204fe2 (patch) | |
tree | 643abc72e48c326e37088b0470260571d9ac542c | |
parent | 3451a8ae76c2c5f103c789abf5aca559d26eb43a (diff) | |
download | hikey-4c73b4a61614dd359207665967b8461a04204fe2.tar.gz |
Cleanup wifi BT firmware and add license text
Change-Id: Ief5814e4c84d37ad4d83b21638f0bfe4e8eac21a
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
-rw-r--r-- | bt-wifi-firmware-util/Android.mk | 35 | ||||
-rw-r--r-- | bt-wifi-firmware-util/NOTICE | 72 | ||||
-rwxr-xr-x | bt-wifi-firmware-util/uim-sysfs.sh | 24 | ||||
-rw-r--r-- | bt-wifi-firmware-util/wl18xx-fw-2.bin | bin | 659920 -> 0 bytes | |||
-rw-r--r-- | bt-wifi-firmware-util/wl18xx-fw-3.bin | bin | 673328 -> 0 bytes | |||
-rw-r--r-- | device.mk | 8 |
6 files changed, 111 insertions, 28 deletions
diff --git a/bt-wifi-firmware-util/Android.mk b/bt-wifi-firmware-util/Android.mk new file mode 100644 index 00000000..1e49e1ca --- /dev/null +++ b/bt-wifi-firmware-util/Android.mk @@ -0,0 +1,35 @@ +# Copyright (C) 2008 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. + +LOCAL_PATH := $(call my-dir) + +TI_WILINK_FW_PATH := $(TARGET_OUT_ETC)/firmware/ti-connectivity + +include $(CLEAR_VARS) +LOCAL_MODULE := TIInit_11.8.32.bts +LOCAL_SRC_FILES := $(FW_WLAN_FULL_PATH)/TIInit_11.8.32.bts +LOCAL_MODULE_CLASS := FIRMWARE +LOCAL_MODULE_PATH := $(TI_WILINK_FW_PATH) +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_OWNER := ti +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := wl18xx-fw-4.bin +LOCAL_SRC_FILES := $(FW_WLAN_FULL_PATH)/wl18xx-fw-4.bin +LOCAL_MODULE_CLASS := FIRMWARE +LOCAL_MODULE_PATH := $(TI_WILINK_FW_PATH) +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_OWNER := ti +include $(BUILD_PREBUILT) diff --git a/bt-wifi-firmware-util/NOTICE b/bt-wifi-firmware-util/NOTICE new file mode 100644 index 00000000..e5bdc11d --- /dev/null +++ b/bt-wifi-firmware-util/NOTICE @@ -0,0 +1,72 @@ +TEXAS INSTRUMENTS TEXT FILE LICENSE + + +Copyright (c) 2008 - 2013 Texas Instruments Incorporated + +All rights reserved not granted herein. + +Limited License. + +If you download and use any version of this software from www.github.com, you +acknowledge and agree that the terms and conditions of this license control and any +previous licenses under which this software may have been provided on www.github.com +are superseded and replaced by the terms and conditions of this license. + +Texas Instruments Incorporated grants a world-wide, royalty-free, non-exclusive +license under copyrights and patents it now or hereafter owns or controls to make, +have made, use, import, offer to sell and sell ("Utilize") this software subject +to the terms herein. With respect to the foregoing patent license, such license +is granted solely to the extent that any such patent is necessary to Utilize the +software alone. The patent license shall not apply to any combinations which +include this software, other than combinations with devices manufactured by or +for TI ("TI Devices"). No hardware patent is licensed hereunder. + +Redistributions must preserve existing copyright notices and reproduce this license +(including the above copyright notice and the disclaimer and (if applicable) source +code license limitations below) in the documentation and/or other materials provided +with the distribution + +Redistribution and use in binary form, without modification, are permitted provided +that the following conditions are met: + +* No reverse engineering, decompilation, or disassembly of this software is permitted + with respect to any software provided in binary form. + +* any redistribution and use are licensed by TI for use only with TI Devices. + +* Nothing shall obligate TI to provide you with source code for the software + licensed and provided to you in object code. + +If software source code is provided to you, modification and redistribution of the +source code are permitted provided that the following conditions are met: + +* any redistribution and use of the source code, including any resulting + derivative works, are licensed by TI for use only with TI Devices. + +* any redistribution and use of any object code compiled from the source + code and any resulting derivative works, are licensed by TI for use only + with TI Devices. + +Neither the name of Texas Instruments Incorporated nor the names of its suppliers +may be used to endorse or promote products derived from this software without specific +prior written permission. + +DISCLAIMER. + +THIS SOFTWARE IS PROVIDED BY TI AND TI'S LICENSORS "AS IS" AND ANY EXPRESS +OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN +NO EVENT SHALL TI AND TI'S LICENSORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +BY UTILIZING THIS SOFTWARE TO ENABLE ANT CODE EMBEDDED ON TI DEVICES, YOU +AGREE THAT NOTHING IN THIS LICENSE GIVES RISE TO ANY WARRANTY OR OTHER +OBLIGATIONS BY TI OR ITS LICENSORS WITH RESPECT TO THE ANT CODE EMBEDDED +ON TI DEVICES AND ENABLED BY THE SOFTWARE UNDER THIS LICENSE. FURTHER, YOU +AGREE THAT NOTHING IN THIS LICENSE GIVES RISE TO ANY RIGHT TO REVERSE ENGINEER, +DECOMPILE OR DISASSEMBLE THE ANT CODE EMBEDDED ON THE TI DEVICES. diff --git a/bt-wifi-firmware-util/uim-sysfs.sh b/bt-wifi-firmware-util/uim-sysfs.sh deleted file mode 100755 index 356f0856..00000000 --- a/bt-wifi-firmware-util/uim-sysfs.sh +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh - -uim=/usr/sbin/uim - -test -x "$uim" || exit 0 - -case "$1" in - start) - echo -n "Starting uim-sysfs daemon" - start-stop-daemon --start --quiet --exec $uim & - echo "." - ;; - stop) - echo -n "Stopping uim-sysfs daemon" - start-stop-daemon --stop --quiet --pidfile /var/run/uim.pid - echo "." - ;; - *) - echo "Usage: /etc/init.d/uim-sysfs.sh {start|stop}" - exit 1 -esac - -exit 0 - diff --git a/bt-wifi-firmware-util/wl18xx-fw-2.bin b/bt-wifi-firmware-util/wl18xx-fw-2.bin Binary files differdeleted file mode 100644 index 4eb4415e..00000000 --- a/bt-wifi-firmware-util/wl18xx-fw-2.bin +++ /dev/null diff --git a/bt-wifi-firmware-util/wl18xx-fw-3.bin b/bt-wifi-firmware-util/wl18xx-fw-3.bin Binary files differdeleted file mode 100644 index 3c799a38..00000000 --- a/bt-wifi-firmware-util/wl18xx-fw-3.bin +++ /dev/null @@ -53,7 +53,7 @@ PRODUCT_PACKAGES += UsbSpeedSwitch # Build libion PRODUCT_PACKAGES += libion -# Build gralloc for hikey +# Build gralloc for hikey PRODUCT_PACKAGES += gralloc.hikey # Set zygote config @@ -62,6 +62,9 @@ PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64 PRODUCT_PACKAGES += libGLES_android +PRODUCT_PACKAGES += TIInit_11.8.32.bts \ + wl18xx-fw-4.bin + # Copy hardware config file(s) PRODUCT_COPY_FILES += \ device/linaro/hikey/etc/permissions/android.hardware.screen.xml:system/etc/permissions/android.hardware.screen.xml \ @@ -80,9 +83,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \ frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \ - device/linaro/hikey/bt-wifi-firmware-util/TIInit_11.8.32.bts:system/etc/firmware/ti-connectivity/TIInit_11.8.32.bts \ - device/linaro/hikey/bt-wifi-firmware-util/TIInit_11.8.32.bts:system/etc/firmware/TIInit_11.8.32.bts \ - device/linaro/hikey/bt-wifi-firmware-util/wl18xx-fw-4.bin:system/etc/firmware/ti-connectivity/wl18xx-fw-4.bin \ device/linaro/hikey/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \ device/linaro/hikey/android_dhcpcd.conf:system/etc/dhcpcd/dhcpcd.conf \ device/linaro/hikey/audio/audio_policy.conf:system/etc/audio_policy.conf |