[PATCH 0/6] Remove WiLink8 recipes moved to meta-ti, update deps

[PATCH 0/6] Remove WiLink8 recipes moved to meta-ti, update deps

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Denys Dmytriyenko (6):
  wl18xx-firmware: moved to meta-ti as wl18xx-fw, remove here
  bt-firmware: moved to meta-ti as bt-fw, remove here
  wlconf: moved to meta-ti, remove here
  wl18xx-target-scripts: moved to meta-ti, remove here
  ti-wifi-utils: moved to meta-ti as wl18xx-calibrator, remove here
  wilink-calibrate: remove outdated wl12xx package

 .../conf/distro/include/arago-source-ipk.inc       |  4 +-
 .../packagegroup-arago-tisdk-connectivity.bb       |  6 +--
 .../recipes-bsp/bt-firmware/bt-firmware_git.bb     | 35 ------------------
 .../recipes-bsp/wl18xx-firmware/wl18xx-firmware.bb | 35 ------------------
 .../0001-Add-Makefile-for-SDK.patch                | 33 -----------------
 .../wl18xx-target-scripts/wl18xx-target-scripts.bb | 26 -------------
 .../recipes-connectivity/wlconf/wlconf.bb          | 43 ----------------------
 .../ti-wifi-utils/ti-wifi-utils-wl18xx.bb          | 34 -----------------
 .../ti-wifi-utils/wilink-calibrate/calibrate.sh    |  7 ----
 .../ti-wifi-utils/wilink-calibrate_1.0.bb          | 17 ---------
 10 files changed, 5 insertions(+), 235 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware_git.bb
 delete mode 100644 meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-firmware.bb
 delete mode 100644 meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-firmware/0001-Add-Makefile-for-SDK.patch
 delete mode 100644 meta-arago-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts.bb
 delete mode 100644 meta-arago-extras/recipes-connectivity/wlconf/wlconf.bb
 delete mode 100644 meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils-wl18xx.bb
 delete mode 100644 meta-arago-extras/recipes-devtools/ti-wifi-utils/wilink-calibrate/calibrate.sh
 delete mode 100644 meta-arago-extras/recipes-devtools/ti-wifi-utils/wilink-calibrate_1.0.bb

-- 
2.7.4

[PATCH 1/6] wl18xx-firmware: moved to meta-ti as wl18xx-fw, remove here

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../conf/distro/include/arago-source-ipk.inc       |  4 +--
 .../packagegroup-arago-tisdk-connectivity.bb       |  2 +-
 .../recipes-bsp/wl18xx-firmware/wl18xx-firmware.bb | 35 ----------------------
 .../0001-Add-Makefile-for-SDK.patch                | 33 --------------------
 4 files changed, 3 insertions(+), 71 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-firmware.bb
 delete mode 100644 meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-firmware/0001-Add-Makefile-for-SDK.patch

diff --git a/meta-arago-distro/conf/distro/include/arago-source-ipk.inc b/meta-arago-distro/conf/distro/include/arago-source-ipk.inc
index 5d2796f..8435bc0 100644
--- a/meta-arago-distro/conf/distro/include/arago-source-ipk.inc
+++ b/meta-arago-distro/conf/distro/include/arago-source-ipk.inc
@@ -100,8 +100,8 @@ SRCIPK_INSTALL_DIR_pn-omap3-sgx-modules = "board-support/extra-drivers/sgx-modul
 CREATE_SRCIPK_pn-ti-compat-wireless-wl18xx = "1"
 SRCIPK_INSTALL_DIR_pn-ti-compat-wireless-wl18xx = "board-support/extra-drivers/${PN}-${PV}"
 
-CREATE_SRCIPK_pn-wl18xx-firmware = "1"
-SRCIPK_INSTALL_DIR_pn-wl18xx-firmware = "board-support/extra-drivers/${PN}-${PV}"
+CREATE_SRCIPK_pn-wl18xx-fw = "1"
+SRCIPK_INSTALL_DIR_pn-wl18xx-fw = "board-support/extra-drivers/${PN}-${PV}"
 
 CREATE_SRCIPK_pn-wl1271-wlan-cli = "1"
 SRCIPK_INSTALL_DIR_pn-wl1271-wlan-cli = "example-applications/wlan"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
index f64998c..c0652fd 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
@@ -28,7 +28,7 @@ WLAN_COMMON = "\
 #    netperf
 
 FIRMWARE_AND_DRIVERS = "\
-    wl18xx-firmware \
+    wl18xx-fw \
     bt-firmware \
 "
 
diff --git a/meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-firmware.bb b/meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-firmware.bb
deleted file mode 100644
index 6981702..0000000
--- a/meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-firmware.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Firmware files for use with TI wl18xx"
-LICENSE = "TI-TSPA"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=4977a0fe767ee17765ae63c435a32a9e"
-
-inherit allarch
-
-PV = "R8.6+git${SRCPV}"
-
-PR = "r7"
-
-PROVIDES += "wl12xx-firmware"
-RPROVIDES_${PN} += "wl12xx-firmware"
-RREPLACES_${PN} += "wl12xx-firmware"
-RCONFLICTS_${PN} += "wl12xx-firmware"
-
-# Tag: R8.6
-SRCREV = "c4c0c7943040473bd9aeba2ab9fa99617fa08a4b"
-BRANCH = "ap_dfs"
-SRC_URI = "git://git.ti.com/wilink8-wlan/wl18xx_fw.git;protocol=git;branch=${BRANCH} \
-           file://0001-Add-Makefile-for-SDK.patch \
-          "
-
-S = "${WORKDIR}/git"
-
-CLEANBROKEN = "1"
-
-do_compile() {
-    :
-}
-
-do_install() {
-    oe_runmake 'DEST_DIR=${D}' install
-}
-
-FILES_${PN} = "/lib/firmware/ti-connectivity/*"
diff --git a/meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-firmware/0001-Add-Makefile-for-SDK.patch b/meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-firmware/0001-Add-Makefile-for-SDK.patch
deleted file mode 100644
index 6d44eb1..0000000
--- a/meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-firmware/0001-Add-Makefile-for-SDK.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f4968600db760ff46d400c258ed1729d14c70f16 Mon Sep 17 00:00:00 2001
-From: Franklin S. Cooper Jr <fcooper@ti.com>
-Date: Wed, 5 Feb 2014 21:03:08 -0600
-Subject: [PATCH] Add Makefile for SDK
-
-* Add Makefile to sources so it is packaged in the SDK.
-
-Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
----
- Makefile |   11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
- create mode 100644 Makefile
-
-diff --git a/Makefile b/Makefile
-new file mode 100644
-index 0000000..1340c98
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,11 @@
-+# Installs the the ti-connectiviy wlan firmware files into the root file system
-+
-+install:
-+	@if [ ! -d $(DESTDIR) ] ; then \
-+		echo "The extracted target filesystem directory doesn't exist."; \
-+		echo "Please run setup.sh in the SDK's root directory and then try again."; \
-+		exit 1; \
-+	fi
-+	install -d  $(DEST_DIR)/lib/firmware/ti-connectivity
-+	cp *.bin $(DEST_DIR)/lib/firmware/ti-connectivity/
-+
--- 
-1.7.0.4
-
-- 
2.7.4

[PATCH 2/6] bt-firmware: moved to meta-ti as bt-fw, remove here

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../packagegroup-arago-tisdk-connectivity.bb       |  2 +-
 .../recipes-bsp/bt-firmware/bt-firmware_git.bb     | 35 ----------------------
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware_git.bb

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
index c0652fd..7e95940 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
@@ -29,7 +29,7 @@ WLAN_COMMON = "\
 
 FIRMWARE_AND_DRIVERS = "\
     wl18xx-fw \
-    bt-firmware \
+    bt-fw \
 "
 
 DEMO_APPS = "\
diff --git a/meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware_git.bb b/meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware_git.bb
deleted file mode 100644
index f82c2a0..0000000
--- a/meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware_git.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Firmware files for Bluetooth"
-LICENSE = "TI-TSPA"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f39eac9f4573be5b012e8313831e72a9"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-# This recipe provides the latest firmware files for wl12xx.
-# Therefore, use the contents of this recipe instead of the contents
-# of linux-firmware-wl12xx.
-RCONFLICTS_${PN} = "linux-firmware-wl12xx"
-RREPLACES_${PN}  = "linux-firmware-wl12xx"
-
-PV = "R8.5+git${SRCPV}"
-PR = "r10"
-
-COMPATIBLE_MACHINE = "ti33x|ti43x|dra7xx"
-
-CLEANBROKEN = "1"
-
-SRCREV = "0c0eae241ea8a6e0b33d59f504741c8d5a2587ce"
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/ti-bt/service-packs.git;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-do_compile() {
-    :
-}
-
-do_install() {
-    install -d ${D}${base_libdir}/firmware/ti-connectivity
-    oe_runmake 'DEST_DIR=${D}' 'BASE_LIB_DIR=${base_libdir}' install
-}
-
-FILES_${PN} += "${base_libdir}/firmware/ti-connectivity/*"
-- 
2.7.4

[PATCH 3/6] wlconf: moved to meta-ti, remove here

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../recipes-connectivity/wlconf/wlconf.bb          | 43 ----------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-connectivity/wlconf/wlconf.bb

diff --git a/meta-arago-extras/recipes-connectivity/wlconf/wlconf.bb b/meta-arago-extras/recipes-connectivity/wlconf/wlconf.bb
deleted file mode 100644
index 625891c..0000000
--- a/meta-arago-extras/recipes-connectivity/wlconf/wlconf.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "Configuration utility for TI wireless drivers"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=adc05a1903d3f107f85c90328e3a9438"
-
-PV = "R8.6+git${SRCPV}"
-
-PR = "r5"
-
-# Tag: R8.6
-SRCREV = "cf8965aad73764022669647fa33852558a657930"
-SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git"
-
-S = "${WORKDIR}/git/wlconf"
-
-EXTRA_OEMAKE = "CC="${CC}""
-
-do_install() {
-	install -d ${D}${bindir}
-	install -d ${D}${bindir}/wlconf/
-	install -d ${D}${bindir}/wlconf/official_inis
-	install -d ${D}/lib/firmware/ti-connectivity
-
-	install -m 0755 wlconf ${D}${bindir}/wlconf/
-	install -m 0755 dictionary.txt ${D}${bindir}/wlconf/
-	install -m 0755 struct.bin ${D}${bindir}/wlconf/
-	install -m 0755 default.conf ${D}${bindir}/wlconf/
-	install -m 0755 wl18xx-conf-default.bin ${D}${bindir}/wlconf/
-	install -m 0755 wl18xx-conf-default.bin ${D}/lib/firmware/ti-connectivity/wl18xx-conf.bin
-	install -m 0755 README ${D}${bindir}/wlconf/
-	install -m 0755 example.conf ${D}${bindir}/wlconf/
-	install -m 0755 example.ini ${D}${bindir}/wlconf/
-	install -m 0755 configure-device.sh ${D}${bindir}/wlconf/
-	install -m 0755 ${S}/official_inis/* \
-			${D}${bindir}/wlconf/official_inis/
-}
-
-FILES_${PN} += " \
-	${bindir}/wlconf \
-	${bindir}/wlconf/official_inis \
-	/lib/firmware/ti-connectivity/wl18xx-conf.bin \
-"
-
-FILES_${PN}-dbg += "${bindir}/wlconf/.debug"
-- 
2.7.4

[PATCH 4/6] wl18xx-target-scripts: moved to meta-ti, remove here

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../wl18xx-target-scripts/wl18xx-target-scripts.bb | 26 ----------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts.bb

diff --git a/meta-arago-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts.bb b/meta-arago-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts.bb
deleted file mode 100644
index 414ba0c..0000000
--- a/meta-arago-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Scripts and configuration files for TI wireless drivers"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=b8d6a0865f50159bf5c0d175d1f4a705"
-
-PV = "R8.6+git${SRCPV}"
-
-PR = "r7"
-
-# Tag: R8.6
-SRCREV = "693f71c709abcaa9047835cf3903aea26a63fa94"
-BRANCH = "sitara-scripts"
-SRC_URI = "git://git.ti.com/wilink8-wlan/wl18xx-target-scripts.git;protocol=git;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-FILES_${PN} += "${datadir}/wl18xx/"
-
-do_install() {
-	install -d ${D}${datadir}/wl18xx/
-
-	scripts=`find ./ -type f -name "*.*"`
-	for s in $scripts
-	do
-		install -m 0755 $s ${D}${datadir}/wl18xx/
-	done
-}
-- 
2.7.4

[PATCH 5/6] ti-wifi-utils: moved to meta-ti as wl18xx-calibrator, remove here

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../packagegroup-arago-tisdk-connectivity.bb       |  2 +-
 .../ti-wifi-utils/ti-wifi-utils-wl18xx.bb          | 34 ----------------------
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils-wl18xx.bb

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
index 7e95940..92e5c73 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
@@ -20,7 +20,7 @@ WLAN_COMMON = "\
     wpa-supplicant-wl18xx \
     crda \
     hostap-daemon-wl18xx \
-    ti-wifi-utils-wl18xx \
+    wl18xx-calibrator \
     wl18xx-target-scripts \
 "
 
diff --git a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils-wl18xx.bb b/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils-wl18xx.bb
deleted file mode 100644
index 1d452f5..0000000
--- a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils-wl18xx.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "The calibrator and other useful utilities for TI wireless solution based on wl12xx driver"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4725015cb0be7be389cf06deeae3683d"
-
-DEPENDS = "libnl"
-RDEPENDS_${PN} = "wl18xx-firmware"
-
-PV = "R8.6+git${SRCPV}"
-
-PR = "r5"
-
-#Tag: R8.6
-SRCREV = "cf8965aad73764022669647fa33852558a657930"
-SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git \
-"
-
-PROVIDES += "ti-wifi-utils"
-RPROVIDES_${PN} += "ti-wifi-utils"
-RREPLACES_${PN} +=  "ti-wifi-utils"
-RCONFLICTS_${PN} +=  "ti-wifi-utils"
-
-S = "${WORKDIR}/git"
-
-export CROSS_COMPILE = "${TARGET_PREFIX}"
-
-EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -I${STAGING_INCDIR}/libnl3/ -DCONFIG_LIBNL32 " \
-		LDFLAGS="${LDFLAGS} -L${STAGING_LIBDIR}" \
-		CC="${CC}" \
-		NLVER=3'
-
-do_install() {
-    install -d ${D}${bindir}
-    install -m 0755 calibrator ${D}${bindir}/
-}
-- 
2.7.4

[PATCH 6/6] wilink-calibrate: remove outdated wl12xx package

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../ti-wifi-utils/wilink-calibrate/calibrate.sh         |  7 -------
 .../ti-wifi-utils/wilink-calibrate_1.0.bb               | 17 -----------------
 2 files changed, 24 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-devtools/ti-wifi-utils/wilink-calibrate/calibrate.sh
 delete mode 100644 meta-arago-extras/recipes-devtools/ti-wifi-utils/wilink-calibrate_1.0.bb

diff --git a/meta-arago-extras/recipes-devtools/ti-wifi-utils/wilink-calibrate/calibrate.sh b/meta-arago-extras/recipes-devtools/ti-wifi-utils/wilink-calibrate/calibrate.sh
deleted file mode 100644
index b028435..0000000
--- a/meta-arago-extras/recipes-devtools/ti-wifi-utils/wilink-calibrate/calibrate.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-echo "Performing wifi calibration..."
-rm /lib/firmware/ti-connectivity/wl1271-nvs.bin
-rmmod wl12xx_sdio.ko
-calibrator plt autocalibrate wlan0 /lib/modules/$(uname -r)/updates/drivers/net/wireless/wl12xx/wl12xx_sdio.ko /usr/share/ti/wifi-utils/ini_files/127x/TQS_S_2.6.ini /lib/firmware/ti-connectivity/wl1271-nvs.bin 00:00:00:00:00:00
-modprobe wl12xx_sdio
-
diff --git a/meta-arago-extras/recipes-devtools/ti-wifi-utils/wilink-calibrate_1.0.bb b/meta-arago-extras/recipes-devtools/ti-wifi-utils/wilink-calibrate_1.0.bb
deleted file mode 100644
index d0aadfb..0000000
--- a/meta-arago-extras/recipes-devtools/ti-wifi-utils/wilink-calibrate_1.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-
-inherit update-rc.d
-INITSCRIPT_NAME="calibrate.sh"
-INITSCRIPT_PARAMS = "start 20 2 3 4 5 ."
-
-PR ="r0"
-
-SRC_URI = "file://calibrate.sh"
-
-S = "${WORKDIR}"
-
-do_install() {
-    install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/calibrate.sh ${D}${sysconfdir}/init.d
-}
-- 
2.7.4