wl12xx-firmware: recipe and bluetooth file clean up

17 files changed, 87 insertions, 12 deletions

diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/bluetooth/BTS_files_v1/115K/WL127xL_BT_Service_Pack_2.4.bts b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/bluetooth/115K/WL127xL_BT_Service_Pack_2.4.bts
index 15a7933..15a7933 100644
--- a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/bluetooth/BTS_files_v1/115K/WL127xL_BT_Service_Pack_2.4.bts
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/bluetooth/115K/WL127xL_BT_Service_Pack_2.4.bts
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/bluetooth/BTS_files_v1/3M/WL127xL_BT_Service_Pack_2.4.bts b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/bluetooth/3M/WL127xL_BT_Service_Pack_2.4.bts
index 4282f32..4282f32 100644
--- a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/bluetooth/BTS_files_v1/3M/WL127xL_BT_Service_Pack_2.4.bts
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/bluetooth/3M/WL127xL_BT_Service_Pack_2.4.bts
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/bluetooth/BTS_files_v1/3M/WL127xL_BT_Service_Pack_2.4.xml b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/bluetooth/3M/WL127xL_BT_Service_Pack_2.4.xml
index 7656fbe..7656fbe 100644
--- a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/bluetooth/BTS_files_v1/3M/WL127xL_BT_Service_Pack_2.4.xml
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/bluetooth/3M/WL127xL_BT_Service_Pack_2.4.xml
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/bluetooth/BTS_files_v1/LICENCE b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/bluetooth/LICENCE
index 2a1539f..2a1539f 100644
--- a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/bluetooth/BTS_files_v1/LICENCE
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/bluetooth/LICENCE
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/wifi/LICENCE b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/wifi/LICENCE
index 085f6c7..085f6c7 100644
--- a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/wifi/LICENCE
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/wifi/LICENCE
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/wifi/wl1271-fw-2.bin b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/wifi/wl1271-fw-2.bin
index a01324e..a01324e 100644
--- a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/wifi/wl1271-fw-2.bin
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/wifi/wl1271-fw-2.bin
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/wifi/wl1271-fw-ap.bin b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/wifi/wl1271-fw-ap.bin
index c145a71..c145a71 100644
--- a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/wifi/wl1271-fw-ap.bin
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/wifi/wl1271-fw-ap.bin
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/wifi/wl1271-fw-multirole-plt.bin b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/wifi/wl1271-fw-multirole-plt.bin
index 784b275..784b275 100755
--- a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/wifi/wl1271-fw-multirole-plt.bin
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/wifi/wl1271-fw-multirole-plt.bin
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/wifi/wl1271-fw-multirole-roc.bin b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/wifi/wl1271-fw-multirole-roc.bin
index 3655919..3655919 100755
--- a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/wifi/wl1271-fw-multirole-roc.bin
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/wifi/wl1271-fw-multirole-roc.bin
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/wifi/wl1271-nvs.bin b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/wifi/wl1271-nvs.bin
index 91978f9..91978f9 100644
--- a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/wifi/wl1271-nvs.bin
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r4.sp2/wifi/wl1271-nvs.bin
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/bluetooth/github.com_TI-ECS_bt-firmware-3c0e4752/LICENCE b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r5.sp4.01/LICENCE
index 29ed482..29ed482 100644
--- a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/bluetooth/github.com_TI-ECS_bt-firmware-3c0e4752/LICENCE
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r5.sp4.01/LICENCE
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/bluetooth/github.com_TI-ECS_bt-firmware-3c0e4752/TIInit_7.6.15.bts b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r5.sp4.01/TIInit_7.6.15.bts
index ed733bc..ed733bc 100644
--- a/multitech/recipes/wl12xx-firmware/wl12xx-firmware/bluetooth/github.com_TI-ECS_bt-firmware-3c0e4752/TIInit_7.6.15.bts
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r5.sp4.01/TIInit_7.6.15.bts
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r5.sp7.01/LICENCE b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r5.sp7.01/LICENCE
new file mode 100644
index 0000000..29ed482
--- /dev/null
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r5.sp7.01/LICENCE
@@ -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/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r5.sp7.01/TIInit_7.6.15.bts b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r5.sp7.01/TIInit_7.6.15.bts
new file mode 100644
index 0000000..ed733bc
--- /dev/null
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r5.sp7.01/TIInit_7.6.15.bts
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r4.sp2.bb b/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r4.sp2.bb
index 3078938..8beaad1 100644
--- a/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r4.sp2.bb
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r4.sp2.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "TI wl1271 firmware"
 HOMEPAGE = "http://processors.wiki.ti.com/index.php/ARM_Processor_Open_Source_Wireless_Connectivity"
-PR="r4"
+PR="r5"
 
 # bluetooth firmware from TI wiki:
 #   http://processors.wiki.ti.com/index.php/OMAP_Wireless_Connectivity_BTS_files_overview
@@ -10,7 +10,7 @@ PR="r4"
 
 # wifi firmware is R4.SP2
 
-SRC_URI = "file://bluetooth/BTS_files_v1/3M/WL127xL_BT_Service_Pack_2.4.bts \
+SRC_URI = "file://bluetooth/3M/WL127xL_BT_Service_Pack_2.4.bts \
 			file://wifi/wl1271-fw-2.bin \
 			file://wifi/wl1271-fw-ap.bin \
 			file://wifi/wl1271-fw-multirole-plt.bin \
@@ -26,7 +26,7 @@ do_install() {
 	# factory nvs file
 	install ${WORKDIR}/wifi/wl1271-nvs.bin ${D}/lib/firmware/ti-connectivity/wl1271-nvs.bin.factory
 	# bluetooth firmware
-	install ${WORKDIR}/bluetooth/BTS_files_v1/3M/WL127xL_BT_Service_Pack_2.4.bts ${D}/lib/firmware/TIInit_7.6.15.bts
+	install ${WORKDIR}/bluetooth/3M/WL127xL_BT_Service_Pack_2.4.bts ${D}/lib/firmware/TIInit_7.6.15.bts
 }
 
 FILES_${PN} = "/lib/firmware"
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r5.sp4.01.bb b/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r5.sp4.01.bb
index 155456a..6805797 100644
--- a/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r5.sp4.01.bb
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r5.sp4.01.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "TI wl1271 firmware"
 HOMEPAGE = "http://processors.wiki.ti.com/index.php/ARM_Processor_Open_Source_Wireless_Connectivity"
-PR="r2"
+PR="r3"
 
 # bluetooth firmware from TI-ECS on github.com:
 # https://github.com/TI-ECS/bt-firmware.git
@@ -15,7 +15,7 @@ PR="r2"
 SRCREV = "ol_R5.SP4.01"
 
 SRC_URI = "git://github.com/TI-OpenLink/ti-utils.git;protocol=git \
-			file://bluetooth/github.com_TI-ECS_bt-firmware-3c0e4752/TIInit_7.6.15.bts \
+			file://TIInit_7.6.15.bts \
 			"
 
 S = "${WORKDIR}/git"
@@ -34,7 +34,7 @@ do_install() {
 	# factory nvs file
 	install ${S}/hw/firmware/wl1271-nvs.bin ${D}/lib/firmware/ti-connectivity/wl1271-nvs.bin.factory
 	# bluetooth firmware
-	install ${WORKDIR}/bluetooth/github.com_TI-ECS_bt-firmware-3c0e4752/TIInit_7.6.15.bts ${D}/lib/firmware/TIInit_7.6.15.bts
+	install ${WORKDIR}/TIInit_7.6.15.bts ${D}/lib/firmware/TIInit_7.6.15.bts
 }
 
 FILES_${PN} = "/lib/firmware"
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r5.sp7.01.bb b/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r5.sp7.01.bb
index 590fdab..d31d921 100644
--- a/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r5.sp7.01.bb
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r5.sp7.01.bb
@@ -1,10 +1,13 @@
 DESCRIPTION = "TI wl1271 firmware"
 HOMEPAGE = "http://processors.wiki.ti.com/index.php/ARM_Processor_Open_Source_Wireless_Connectivity"
-PR="r1"
+PR="r2"
 
-# bluetooth firmware from TI wiki:
-#   http://processors.wiki.ti.com/index.php/OMAP_Wireless_Connectivity_BTS_files_overview
-#   http://processors.wiki.ti.com/images/a/a2/BTS_files_v1.zip
+# bluetooth firmware from TI-ECS on github.com:
+# https://github.com/TI-ECS/bt-firmware.git
+# revision 3c0e4752ba91be195ac05226725428dfdc1a4759
+# Last file log message: "Updated to service pack 2.14"
+# file: am335x/TIInit_7.6.15.bts
+# md5sum: a46c46104c7fab23bb9ebfae1633a3af
 
 # wifi firmware from TI-OpenLink on github.com
 # git://github.com/TI-OpenLink/ti-utils.git
@@ -12,7 +15,7 @@ PR="r1"
 SRCREV = "ol_R5.SP7.01"
 
 SRC_URI = "git://github.com/TI-OpenLink/ti-utils.git;protocol=git \
-			file://bluetooth/3M/WL127xL_BT_Service_Pack_2.4.bts \
+			file://TIInit_7.6.15.bts \
 			"
 
 S = "${WORKDIR}/git"
@@ -31,7 +34,7 @@ do_install() {
 	# factory nvs file
 	install ${S}/hw/firmware/wl1271-nvs.bin ${D}/lib/firmware/ti-connectivity/wl1271-nvs.bin.factory
 	# bluetooth firmware
-	install ${WORKDIR}/bluetooth/3M/WL127xL_BT_Service_Pack_2.4.bts ${D}/lib/firmware/TIInit_7.6.15.bts
+	install ${WORKDIR}/TIInit_7.6.15.bts ${D}/lib/firmware/TIInit_7.6.15.bts
 }
 
 FILES_${PN} = "/lib/firmware"