* [PATCH 1/5] Remove Wilink 6 references from packagegroups and other recipes
@ 2014-01-17 1:19 Franklin S. Cooper Jr
2014-01-17 1:19 ` [PATCH 2/5] Remove all Wilink 6 related recipes Franklin S. Cooper Jr
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Franklin S. Cooper Jr @ 2014-01-17 1:19 UTC (permalink / raw)
To: meta-arago; +Cc: Franklin S. Cooper Jr
* Wilink 6 will no longer be supported in future SDKs.
* Remove references to Wilink 6 from various packagegroups and other recipes and
use Wilink 8 packages by default.
---
.../conf/distro/arago-source-ipk.conf | 7 +++-
.../conf/distro/include/arago-prefs.inc | 21 +----------
...ckagegroup-arago-tisdk-connectivity-sdk-host.bb | 8 ++---
...agegroup-arago-tisdk-connectivity-sdk-target.bb | 17 +--------
.../packagegroup-arago-tisdk-connectivity.bb | 36 ++++---------------
.../packagegroup-arago-tisdk-matrix.bb | 14 +-------
.../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb | 5 +--
7 files changed, 23 insertions(+), 85 deletions(-)
diff --git a/meta-arago-distro/conf/distro/arago-source-ipk.conf b/meta-arago-distro/conf/distro/arago-source-ipk.conf
index ef41d94..9b78258 100644
--- a/meta-arago-distro/conf/distro/arago-source-ipk.conf
+++ b/meta-arago-distro/conf/distro/arago-source-ipk.conf
@@ -94,12 +94,15 @@ SRCIPK_INSTALL_DIR_pn-bt-enable = "board-support/extra-drivers/${PN}-${PV}"
CREATE_SRCIPK_pn-bt-firmware = "1"
SRCIPK_INSTALL_DIR_pn-bt-firmware = "board-support/extra-drivers/${PN}-${PV}"
-CREATE_SRCIPK_pn-ti-compat-wireless-wl12xx = "1"
-SRCIPK_INSTALL_DIR_pn-ti-compat-wireless-wl12xx = "board-support/extra-drivers/${PN}-${PV}"
+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-ti-compat-bluetooth = "1"
SRCIPK_INSTALL_DIR_pn-ti-compat-bluetooth = "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-wl1271-wlan-cli = "1"
SRCIPK_INSTALL_DIR_pn-wl1271-wlan-cli = "example-applications/wlan"
diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc
index 9c7bcbd..e1da2e9 100644
--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
@@ -93,22 +93,5 @@ PREFERRED_VERSION_bluez-hcidump = "2.2"
PREFERRED_VERSION_bash = "3.2.48"
PREFERRED_VERSION_gettext = "0.16.1"
-WILINK_VERSION = "WILINK-8"
-# For AM335x & AM43x Wilink 8 is now the default version to be used
-WILINK_VERSION_ti33x = "WILINK-8"
-WILINK_VERSION_ti43x = "WILINK-8"
-PREFERRED_PROVIDER_wl12xx-firmware = "${@base_contains('WILINK_VERSION','WILINK-8','wl18xx-firmware','wl12xx-firmware',d)}"
-PREFERRED_PROVIDER_ti-compat-wireless-wl12xx = "${@base_contains('WILINK_VERSION','WILINK-8','ti-compat-wireless-wl18xx','ti-compat-wireless-wl12xx',d)}"
-PREFERRED_PROVIDER_hostap-daemon = "${@base_contains('WILINK_VERSION','WILINK-8','hostap-daemon-wl18xx','hostap-daemon',d)}"
-PREFERRED_PROVIDER_wpa-supplicant = "${@base_contains('WILINK_VERSION','WILINK-8','wpa-supplicant-wl18xx','wpa-supplicant',d)}"
-PREFERRED_PROVIDER_ti-wifi-utils = "${@base_contains('WILINK_VERSION','WILINK-8','ti-wifi-utils-wl18xx','ti-wifi-utils',d)}"
-
-# Support Wilink 6 PG 2 modules
-# By default am180x-evm comes with an outdated wilink 6 module
-# All other platforms build the latest Wilink 6 PG 3 modules
-PREFERRED_VERSION_ti-compat-bluetooth_am180x-evm = "r5.00.18"
-PREFERRED_VERSION_ti-compat-wireless-wl12xx_am180x-evm = "r5.00.18"
-PREFERRED_VERSION_wl12xx-firmware_am180x-evm = "r5.00.18"
-PREFERRED_VERSION_wpa-supplicant_am180x-evm = "r5.00.18"
-PREFERRED_VERSION_hostap-daemon_am180x-evm = "r5.00.18"
-PREFERRED_VERSION_ti-wifi-utils_am180x-evm = "r5.00.18"
+PREFERRED_PROVIDER_wpa-supplicant = "wpa-supplicant"
+PREFERRED_PROVIDER_wpa-supplicant_ti33x = "wpa-supplicant-wl18xx"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-host.bb
index 8d4d081..50ca1bc 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-host.bb
@@ -1,25 +1,23 @@
DESCRIPTION = "Task to install wlan and bluetooth sources into the SDK"
LICENSE = "MIT"
-PR = "r6"
+PR = "r7"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
# Further breaks to resolve
-# ti-compat-wireless-wl12xx-src
# ti-compat-bluetooth-src
FIRMWARE_AND_DRIVERS_SRC = "\
bt-firmware-src \
bt-enable-src \
+ wl18xx-firmware-src \
"
CONNECTIVITY_RDEPENDS = ""
-CONNECTIVITY_RDEPENDS_am37x-evm = "${FIRMWARE_AND_DRIVERS_SRC}"
-CONNECTIVITY_RDEPENDS_am180x-evm = "${FIRMWARE_AND_DRIVERS_SRC}"
-CONNECTIVITY_RDEPENDS_ti33x = "${@base_contains('ARAGO_BRAND','amsdk','${FIRMWARE_AND_DRIVERS_SRC}','',d)}"
+CONNECTIVITY_RDEPENDS_ti33x = "${FIRMWARE_AND_DRIVERS_SRC}"
RDEPENDS_${PN} = "\
${CONNECTIVITY_RDEPENDS} \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb
index da23384..b920770 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to install wlan and bluetooth headers and libraries into the SDK"
LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
inherit packagegroup
@@ -14,24 +14,11 @@ BLUETOOTH_STACK = "\
CONNECTIVITY_RDEPENDS = ""
-CONNECTIVITY_RDEPENDS_am37x-evm = "\
- ${BLUETOOTH_STACK} \
-"
-
-# wpa-supplicant-dev
-
-CONNECTIVITY_RDEPENDS_am180x-evm = "\
- ${BLUETOOTH_STACK} \
-"
-
-# wpa-supplicant-dev
-
CONNECTIVITY_RDEPENDS_ti33x = "\
${BLUETOOTH_STACK} \
+ wpa-supplicant-wl18xx-dev \
"
-# wpa-supplicant-dev
-
RDEPENDS_${PN} = "\
${CONNECTIVITY_RDEPENDS} \
"
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 d7d2ef2..fd71494 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
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to install wlan and bluetooth packages into the target FS"
LICENSE = "MIT"
-PR = "r18"
+PR = "r19"
inherit packagegroup
@@ -22,11 +22,11 @@ WLAN_COMMON = "\
pulseaudio-module-bluetooth-discover \
pulseaudio-module-bluetooth-device \
eventdump \
- ${@base_contains('WILINK_VERSION','WILINK-8','wlconf','',d)} \
- wpa-supplicant \
+ wlconf \
+ wpa-supplicant-wl18xx \
crda \
- hostap-daemon \
- ti-wifi-utils \
+ hostap-daemon-wl18xx \
+ ti-wifi-utils-wl18xx \
"
# No bluetooth/bluetooth.h
@@ -34,12 +34,10 @@ WLAN_COMMON = "\
# netperf
# Further breaks to resolve
-# ti-compat-wireless-wl12xx
# ti-compat-bluetooth
FIRMWARE_AND_DRIVERS = "\
- "${@base_contains('WILINK_VERSION','WILINK-6',' oppserver bt-firmware bt-enable' , '',d)}"\
- wl12xx-firmware \
+ wl18xx-firmware \
"
BLUETOOTH_STACK = "\
@@ -55,34 +53,16 @@ BLUETOOTH_STACK = "\
DEMO_APPS = "\
bluetooth-gui \
- wl1271-demo \
+ wpa-gui-e \
"
-# wifi-direct-demo
-# battleship
-# wpa-gui-e
-
CONNECTIVITY_RDEPENDS = ""
-CONNECTIVITY_RDEPENDS_am37x-evm = "\
- ${WLAN_COMMON} \
- ${BLUETOOTH_STACK} \
- ${DEMO_APPS} \
- ${FIRMWARE_AND_DRIVERS} \
-"
-
-CONNECTIVITY_RDEPENDS_am180x-evm = "\
- ${WLAN_COMMON} \
- ${BLUETOOTH_STACK} \
- ${DEMO_APPS} \
- ${FIRMWARE_AND_DRIVERS} \
-"
-
CONNECTIVITY_RDEPENDS_ti33x = "\
${WLAN_COMMON} \
${BLUETOOTH_STACK} \
${DEMO_APPS} \
- ${@base_contains('ARAGO_BRAND','amsdk','${FIRMWARE_AND_DRIVERS}','',d)} \
+ ${FIRMWARE_AND_DRIVERS} \
"
RDEPENDS_${PN} = "\
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
index c3143d3..311ad2e 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to include Matrix v2"
LICENSE = "MIT"
-PR = "r23"
+PR = "r24"
inherit packagegroup
@@ -68,9 +68,6 @@ MATRIX_APPS_append_ti33x = " \
matrix-gui-bluetooth-demos \
"
-# matrix-gui-wifi-battleship-demo
-# matrix-gui-wifi-direct-demo
-
MATRIX_APPS_append_ti43x = " \
${@base_contains('MACHINE_FEATURES','sgx','${MATRIX_SGX_DEMOS}','',d)} \
\
@@ -114,24 +111,15 @@ MATRIX_APPS_append_am37x-evm = " \
matrix-gui-display-control \
matrix-gui-clocks \
\
- matrix-gui-wifi-demos \
- matrix-gui-bluetooth-demos \
\
matrix-multimedia-demo-audiocapture \
"
-# matrix-gui-wifi-battleship-demo
-# matrix-gui-wifi-direct-demo
-
MATRIX_APPS_append_am180x-evm = " \
- matrix-gui-wifi-demos \
matrix-gui-bluetooth-demos \
matrix-gui-pru-demos \
"
-# matrix-gui-wifi-battleship-demo
-# matrix-gui-wifi-direct-demo
-
RDEPENDS_${PN} = " \
${MATRIX_ESSENTIALS} \
${MATRIX_GUI} \
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
index bcc8d81..913553a 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
@@ -33,7 +33,7 @@ SRC_URI = "\
file://Makefile_oprofile-example \
"
-PR = "r20"
+PR = "r21"
MAKEFILES_COMMON = "linux \
matrix-gui \
@@ -56,7 +56,6 @@ MAKEFILES_append_omap3 = " u-boot-spl \
"
MAKEFILES_append_am37x-evm = " av-examples \
ti-ocf-crypto-module \
- wireless \
"
MAKEFILES_append_am3517-evm = " av-examples \
ti-ocf-crypto-module \
@@ -65,6 +64,7 @@ MAKEFILES_append_ti33x = " u-boot-spl \
${QUICK_PLAYGROUND} \
ti-crypto-examples \
linux-dtbs \
+ wireless \
"
MAKEFILES_append_ti43x = " u-boot-spl \
${QUICK_PLAYGROUND} \
@@ -78,7 +78,6 @@ MAKEFILES_append_omap-a15 = " u-boot-spl \
"
MAKEFILES_append_am180x-evm = " pru \
u-boot-legacy \
- wireless \
"
# Use ARCH format expected by the makefile
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/5] Remove all Wilink 6 related recipes
2014-01-17 1:19 [PATCH 1/5] Remove Wilink 6 references from packagegroups and other recipes Franklin S. Cooper Jr
@ 2014-01-17 1:19 ` Franklin S. Cooper Jr
2014-01-17 1:19 ` [PATCH 3/5] Remove all Wilink bluetooth references from packagegroups and other recipes Franklin S. Cooper Jr
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Franklin S. Cooper Jr @ 2014-01-17 1:19 UTC (permalink / raw)
To: meta-arago; +Cc: Franklin S. Cooper Jr
* Wilink 6 will no longer be supported in future sdks and kernels.
* Remove all Wilink 6 related recipes.
* Users who absolutely need Wilink 6 can locally revert this patch or use any of
the older maintenance branches.
---
.../wpa-supplicant_r5.00.18.bbappend | 11 -
.../wpa-supplicant_r5.sp4.01.bbappend | 11 -
...01-compat-wireless-add-pm_runtime_enabled.patch | 36 --
.../0001-git-version-use-compat-base-tree.patch | 29 --
...wl12xx-Decrease-number-of-RX-transactions.patch | 34 --
...tional-two-members-for-wl12xx_platform_da.patch | 30 --
...wl12xx-Decrease-number-of-TX-transactions.patch | 139 -------
.../0001-compat-wireless-exclude-BT-building.patch | 29 --
...xx-detect-between-wl1271-PG-3.0-and-lower.patch | 65 ---
.../0002-compat-wireless-enable-test-mode.patch | 29 --
...ompat-wireless-enable-uapsd-configuration.patch | 27 --
.../0004-added-driver-version.patch | 36 --
.../ti-compat-wireless-wl12xx_r5.00.18.bb | 49 ---
.../ti-compat-wireless-wl12xx_r5.sp4.01.bb | 66 ---
.../wl12xx-firmware-r5.sp4.01/Makefile | 7 -
.../wl12xx-firmware/wl12xx-firmware_r5.00.18.bb | 28 --
.../wl12xx-firmware/wl12xx-firmware_r5.sp4.01.bb | 32 --
.../battleship/battleship_git.bb | 48 ---
.../battleship/files/battleship.desktop | 9 -
...d-change-conf-file-for-better-oob-startup.patch | 49 ---
...d-change-conf-file-for-better-oob-startup.patch | 40 --
.../hostap/hostap-daemon_r5.00.18.bb | 12 -
.../hostap/hostap-daemon_r5.sp4.01.bb | 12 -
.../files/wifi-direct-demo.desktop | 9 -
.../wifi-direct-demo/files/wifi_exit.sh | 3 -
.../wifi-direct-demo/files/wifi_init.sh | 13 -
.../wifi-direct-demo/wifi-direct-demo_git.bb | 52 ---
.../wifi-direct-launcher/wifi-direct-launcher.sh | 13 -
.../wifi-direct-launcher_1.0.bb | 17 -
.../wl1271-demo/0001-Add-additional-hci0-up.patch | 54 ---
.../wl12xx-demo/wl1271-demo_git.bb | 48 ---
...ant-dbus-AP-Add-support-for-WPS-Internal-.patch | 134 ------
.../wpa-supplicant-r5.00.18/defconfig | 426 -------------------
.../wpa-supplicant-r5.sp4.01/defconfig | 430 --------------------
.../wpa-supplicant/wpa-supplicant_r5.00.18.bb | 14 -
.../wpa-supplicant/wpa-supplicant_r5.sp4.01.bb | 13 -
.../ti-wifi-utils/ti-wifi-utils.inc | 29 --
.../ti-wifi-utils/ti-wifi-utils_r5.00.18.bb | 8 -
.../ti-wifi-utils/ti-wifi-utils_r5.sp3.05.bb | 10 -
39 files changed, 0 insertions(+), 2101 deletions(-)
delete mode 100755 meta-arago-distro/recipes-connectivity/wpa-supplicant/wpa-supplicant_r5.00.18.bbappend
delete mode 100755 meta-arago-distro/recipes-connectivity/wpa-supplicant/wpa-supplicant_r5.sp4.01.bbappend
delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-compat-wireless-add-pm_runtime_enabled.patch
delete mode 100755 meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-git-version-use-compat-base-tree.patch
delete mode 100755 meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-wl12xx-Decrease-number-of-RX-transactions.patch
delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-wl12xx-additional-two-members-for-wl12xx_platform_da.patch
delete mode 100755 meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0002-wl12xx-Decrease-number-of-TX-transactions.patch
delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0001-compat-wireless-exclude-BT-building.patch
delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0001-wl12xx-detect-between-wl1271-PG-3.0-and-lower.patch
delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0002-compat-wireless-enable-test-mode.patch
delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0002-ti-compat-wireless-enable-uapsd-configuration.patch
delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0004-added-driver-version.patch
delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx_r5.00.18.bb
delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx_r5.sp4.01.bb
delete mode 100644 meta-arago-extras/recipes-bsp/wl12xx-firmware/wl12xx-firmware-r5.sp4.01/Makefile
delete mode 100644 meta-arago-extras/recipes-bsp/wl12xx-firmware/wl12xx-firmware_r5.00.18.bb
delete mode 100644 meta-arago-extras/recipes-bsp/wl12xx-firmware/wl12xx-firmware_r5.sp4.01.bb
delete mode 100644 meta-arago-extras/recipes-connectivity/battleship/battleship_git.bb
delete mode 100644 meta-arago-extras/recipes-connectivity/battleship/files/battleship.desktop
delete mode 100644 meta-arago-extras/recipes-connectivity/hostap/hostap-daemon-r5.00.18/0001-hostapd-change-conf-file-for-better-oob-startup.patch
delete mode 100644 meta-arago-extras/recipes-connectivity/hostap/hostap-daemon-r5.sp4.01/0001-hostapd-change-conf-file-for-better-oob-startup.patch
delete mode 100644 meta-arago-extras/recipes-connectivity/hostap/hostap-daemon_r5.00.18.bb
delete mode 100644 meta-arago-extras/recipes-connectivity/hostap/hostap-daemon_r5.sp4.01.bb
delete mode 100644 meta-arago-extras/recipes-connectivity/wifi-direct-demo/files/wifi-direct-demo.desktop
delete mode 100644 meta-arago-extras/recipes-connectivity/wifi-direct-demo/files/wifi_exit.sh
delete mode 100644 meta-arago-extras/recipes-connectivity/wifi-direct-demo/files/wifi_init.sh
delete mode 100644 meta-arago-extras/recipes-connectivity/wifi-direct-demo/wifi-direct-demo_git.bb
delete mode 100644 meta-arago-extras/recipes-connectivity/wifi-direct-launcher/wifi-direct-launcher/wifi-direct-launcher.sh
delete mode 100644 meta-arago-extras/recipes-connectivity/wifi-direct-launcher/wifi-direct-launcher_1.0.bb
delete mode 100644 meta-arago-extras/recipes-connectivity/wl12xx-demo/wl1271-demo/0001-Add-additional-hci0-up.patch
delete mode 100644 meta-arago-extras/recipes-connectivity/wl12xx-demo/wl1271-demo_git.bb
delete mode 100644 meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-r5.00.18/0001-wpa_supplicant-dbus-AP-Add-support-for-WPS-Internal-.patch
delete mode 100755 meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-r5.00.18/defconfig
delete mode 100755 meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-r5.sp4.01/defconfig
delete mode 100644 meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant_r5.00.18.bb
delete mode 100644 meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant_r5.sp4.01.bb
delete mode 100644 meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils.inc
delete mode 100644 meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils_r5.00.18.bb
delete mode 100644 meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils_r5.sp3.05.bb
diff --git a/meta-arago-distro/recipes-connectivity/wpa-supplicant/wpa-supplicant_r5.00.18.bbappend b/meta-arago-distro/recipes-connectivity/wpa-supplicant/wpa-supplicant_r5.00.18.bbappend
deleted file mode 100755
index 6fe2023..0000000
--- a/meta-arago-distro/recipes-connectivity/wpa-supplicant/wpa-supplicant_r5.00.18.bbappend
+++ /dev/null
@@ -1,11 +0,0 @@
-################################################################################
-######################### TSU EXEMPTION REQUIRED ###############################
-################################################################################
-# Versions of wpa_supplicant that are TSU Exempted:
-# wpa_supplicant-0.7.3
-
-# This package requires TSU exemption. Any update to the version of
-# wpa_supplicant must be double checked to see if a new TSU exemption must be made.
-################################################################################
-
-PR_append = "-arago0"
diff --git a/meta-arago-distro/recipes-connectivity/wpa-supplicant/wpa-supplicant_r5.sp4.01.bbappend b/meta-arago-distro/recipes-connectivity/wpa-supplicant/wpa-supplicant_r5.sp4.01.bbappend
deleted file mode 100755
index 6fe2023..0000000
--- a/meta-arago-distro/recipes-connectivity/wpa-supplicant/wpa-supplicant_r5.sp4.01.bbappend
+++ /dev/null
@@ -1,11 +0,0 @@
-################################################################################
-######################### TSU EXEMPTION REQUIRED ###############################
-################################################################################
-# Versions of wpa_supplicant that are TSU Exempted:
-# wpa_supplicant-0.7.3
-
-# This package requires TSU exemption. Any update to the version of
-# wpa_supplicant must be double checked to see if a new TSU exemption must be made.
-################################################################################
-
-PR_append = "-arago0"
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-compat-wireless-add-pm_runtime_enabled.patch b/meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-compat-wireless-add-pm_runtime_enabled.patch
deleted file mode 100644
index ba73dd8..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-compat-wireless-add-pm_runtime_enabled.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0f11fd034274c795d9c506faa83a9fa947ba358a Mon Sep 17 00:00:00 2001
-From: Moosa <moosab@ti.com>
-Date: Thu, 3 May 2012 17:37:17 +0300
-Subject: [PATCH] compat-wireless: add pm_runtime_enabled
-
-* Add pm_runtime definition to header file
-
-Upstream-Status: Pending
-
-Signed-off-by: Moosa Baransi <moosab@ti.com>
----
- include/linux/compat-2.6.38.h | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/include/linux/compat-2.6.38.h b/include/linux/compat-2.6.38.h
-index 63f9dd6..94ee602 100644
---- a/include/linux/compat-2.6.38.h
-+++ b/include/linux/compat-2.6.38.h
-@@ -9,6 +9,15 @@
- #include <linux/skbuff.h>
- #include <linux/etherdevice.h>
-
-+#ifdef CONFIG_PM_RUNTIME
-+static inline bool pm_runtime_enabled(struct device *dev)
-+{
-+ return !dev->power.disable_depth;
-+}
-+#else
-+ static inline bool pm_runtime_enabled(struct device *dev) { return false; }
-+#endif
-+
- /* rename member in struct mmc_host in include/linux/mmc/host.h */
- #define max_segs max_hw_segs
-
---
-1.7.1
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-git-version-use-compat-base-tree.patch b/meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-git-version-use-compat-base-tree.patch
deleted file mode 100755
index 61fe912..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-git-version-use-compat-base-tree.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-For compat-wireless based builds use compat_base_tree_version in version.h
-When building with compat-wireless mechanism, the version info captured in version.h reflects target kernel and not the wl12xx version.
-Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
-
-diff a/drivers/net/wireless/wl12xx/Makefile b/drivers/net/wireless/wl12xx/Makefile
-
---- a/drivers/net/wireless/wl12xx/Makefile 2012-08-12 18:18:10.000000000 +0300
-+++ b/drivers/net/wireless/wl12xx/Makefile 2012-08-13 13:55:11.000000000 +0300
-@@ -3,12 +3,16 @@
-
- define filechk_version.h
- (echo 'static const char *wl12xx_timestamp = __TIMESTAMP__;'; \
-- echo 'static const char *wl12xx_git_head = \
-- "$(shell git describe --dirty)";')
-+ echo '#ifdef COMPAT_BASE_TREE_VERSION'; \
-+ echo 'static const char *wl12xx_git_head = COMPAT_BASE_TREE_VERSION;'; \
-+ echo '#else'; \
-+ echo 'static const char *wl12xx_git_head = \
-+ "$(shell git describe --dirty)";'; \
-+ echo '#endif')
- endef
-
--$(obj)/version.h: .git/HEAD .git/index .git/refs/tags
-- @$(call filechk,version.h)
-+#$(obj)/version.h: .git/HEAD .git/index .git/refs/tags
-+# @$(call filechk,version.h)
-
- $(obj)/main.c: $(src)/version.h
-
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-wl12xx-Decrease-number-of-RX-transactions.patch b/meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-wl12xx-Decrease-number-of-RX-transactions.patch
deleted file mode 100755
index 90aec78..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-wl12xx-Decrease-number-of-RX-transactions.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5cd7de59a61168b784ea7f51c09e64f847e81c92 Mon Sep 17 00:00:00 2001
-From: Ido Yariv <ido@wizery.com>
-Date: Tue, 13 Dec 2011 23:16:01 +0200
-Subject: [PATCH 1/2] wl12xx: Decrease number of RX transactions
-
-On weak platforms, it is crucial to keep the number of SDIO transactions
-to a bare minimum. It is probably more important to keep CPU utilization
-low, than to handle FW events asap.
-
-In order to decrease the number of RX transactions, set the FW to only
-wake up the host when it has at least 4 pending packets. In addition,
-increase the relevant timeout, so the FW could actually reach this
-threshold.
----
- drivers/net/wireless/wl12xx/main.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
-index bdb7166..f90b96a 100644
---- a/drivers/net/wireless/wl12xx/main.c
-+++ b/drivers/net/wireless/wl12xx/main.c
-@@ -130,8 +130,8 @@ static struct conf_drv_settings default_conf = {
- .rts_threshold = IEEE80211_MAX_RTS_THRESHOLD,
- .rx_cca_threshold = 0,
- .irq_blk_threshold = 0xFFFF,
-- .irq_pkt_threshold = 0,
-- .irq_timeout = 600,
-+ .irq_pkt_threshold = 4,
-+ .irq_timeout = 1200,
- .queue_type = CONF_RX_QUEUE_TYPE_LOW_PRIORITY,
- },
- .tx = {
---
-1.7.7.6
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-wl12xx-additional-two-members-for-wl12xx_platform_da.patch b/meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-wl12xx-additional-two-members-for-wl12xx_platform_da.patch
deleted file mode 100644
index 69863cb..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0001-wl12xx-additional-two-members-for-wl12xx_platform_da.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 351a513dabfb55c3aab448613c2b10b7b5788d93 Mon Sep 17 00:00:00 2001
-From: Vita Preskovsky <vitap@ti.com>
-Date: Sun, 1 Jul 2012 11:49:30 +0300
-Subject: [PATCH] wl12xx: additional two members for wl12xx_platform_data
-
- * Adding bt_enable_gpio and wlan_enable_gpio to wl12xx_platform_data.
- This is needed in order to align this structure
- with the one which is part of the linux kernel
-
-
-Signed-off-by: Vita Preskovsky <vitap@ti.com>
----
- include/linux/wl12xx.h | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h
-index 0d63731..535058e 100644
---- a/include/linux/wl12xx.h
-+++ b/include/linux/wl12xx.h
-@@ -54,6 +54,8 @@ struct wl12xx_platform_data {
- int board_ref_clock;
- int board_tcxo_clock;
- unsigned long platform_quirks;
-+ int bt_enable_gpio;
-+ int wlan_enable_gpio;
- bool pwr_in_suspend;
-
- struct wl1271_if_operations *ops;
---
-1.7.0.4
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0002-wl12xx-Decrease-number-of-TX-transactions.patch b/meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0002-wl12xx-Decrease-number-of-TX-transactions.patch
deleted file mode 100755
index 3e2185a..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/files/0002-wl12xx-Decrease-number-of-TX-transactions.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From a7807fffc76117a9d0a40fdcc85b56644e81f34c Mon Sep 17 00:00:00 2001
-From: Eyal Reizer <eyalr@ti.com>
-Date: Tue, 27 Nov 2012 16:05:20 +0200
-Subject: [PATCH] wl12xx: Decrease number of TX transactions
-
-On weak platforms, it is crucial to keep the number of SDIO transactions
-to a bare minimum. It is probably more important to keep CPU utilization
-low, than to handle FW events asap.
-
-In order to decrease the number of TX transactions, don't schedule tx
-work right away for every outgoing packet. Instead, try to wait for a
-short period before scheduling tx work if there aren't enough pending
-packets.
-
-In addition, increase the TX pacing timeout, so the FW will have enough
-free memory blocks for larger transfers.
-
-Adapted from original patch made by Ido Yariv <ido@wizery.com>
-Signed-off-by: Eyal Reizer <eyalr@ti.com>
----
- drivers/net/wireless/wl12xx/main.c | 39 ++++++++++++++++++++++++++++++----
- drivers/net/wireless/wl12xx/wl12xx.h | 3 +++
- 2 files changed, 38 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
-index c9888f4..a59ac43 100644
---- a/drivers/net/wireless/wl12xx/main.c
-+++ b/drivers/net/wireless/wl12xx/main.c
-@@ -218,8 +218,8 @@ static struct conf_drv_settings default_conf = {
- },
- },
- .frag_threshold = IEEE80211_MAX_FRAG_THRESHOLD,
-- .tx_compl_timeout = 700,
-- .tx_compl_threshold = 4,
-+ .tx_compl_timeout = 1500,
-+ .tx_compl_threshold = 6,
- .basic_rate = CONF_HW_BIT_RATE_1MBPS,
- .basic_rate_5 = CONF_HW_BIT_RATE_6MBPS,
- .tmpl_short_retry_limit = 10,
-@@ -1199,6 +1199,8 @@ static int wl12xx_irq_locked(struct wl1271 *wl)
- spin_lock_irqsave(&wl->wl_lock, flags);
- if (!test_bit(WL1271_FLAG_FW_TX_BUSY, &wl->flags) &&
- wl1271_tx_total_queue_count(wl) > 0) {
-+ hrtimer_try_to_cancel(&wl->tx_timer);
-+ clear_bit(WL1271_FLAG_TX_TIMER_SET, &wl->flags);
- spin_unlock_irqrestore(&wl->wl_lock, flags);
- /*
- * In order to avoid starvation of the TX path,
-@@ -2056,6 +2058,9 @@ out:
- return ret;
- }
-
-+#define TX_PACKETS_THRESHOLD 6
-+#define TX_WORK_DELAY_NS (1500 * 1000)
-+
- static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
- {
- struct wl1271 *wl = hw->priv;
-@@ -2113,14 +2118,37 @@ static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
- * before that, the tx_work will not be initialized!
- */
-
-- if (!test_bit(WL1271_FLAG_FW_TX_BUSY, &wl->flags) &&
-- !test_bit(WL1271_FLAG_TX_PENDING, &wl->flags))
-+ if (test_bit(WL1271_FLAG_FW_TX_BUSY, &wl->flags) ||
-+ test_bit(WL1271_FLAG_TX_PENDING, &wl->flags))
-+ goto out;
-+
-+ if (wl1271_tx_total_queue_count(wl) < TX_PACKETS_THRESHOLD) {
-+ if (!test_and_set_bit(WL1271_FLAG_TX_TIMER_SET, &wl->flags))
-+ hrtimer_start(&wl->tx_timer,
-+ ktime_set(0, TX_WORK_DELAY_NS),
-+ HRTIMER_MODE_REL);
-+ } else {
-+ hrtimer_try_to_cancel(&wl->tx_timer);
-+ clear_bit(WL1271_FLAG_TX_TIMER_SET, &wl->flags);
- ieee80211_queue_work(wl->hw, &wl->tx_work);
-+ }
-
- out:
- spin_unlock_irqrestore(&wl->wl_lock, flags);
- }
-
-+enum hrtimer_restart wl12xx_tx_timer(struct hrtimer *timer)
-+{
-+ struct wl1271 *wl = container_of(timer, struct wl1271, tx_timer);
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&wl->wl_lock, flags);
-+ clear_bit(WL1271_FLAG_TX_TIMER_SET, &wl->flags);
-+ ieee80211_queue_work(wl->hw, &wl->tx_work);
-+ spin_unlock_irqrestore(&wl->wl_lock, flags);
-+ return HRTIMER_NORESTART;
-+}
-+
- int wl1271_tx_dummy_packet(struct wl1271 *wl)
- {
- unsigned long flags;
-@@ -2740,6 +2768,7 @@ static void wl1271_op_stop_locked(struct wl1271 *wl)
- * held while doing so without deadlocking.
- */
- wlcore_disable_interrupts_nosync(wl);
-+ hrtimer_cancel(&wl->tx_timer);
- mutex_unlock(&wl->mutex);
-
- mutex_lock(&wl_list_mutex);
-@@ -6798,6 +6827,8 @@ static struct ieee80211_hw *wl1271_alloc_hw(void)
- wl->active_sta_count = 0;
- wl->fwlog_size = 0;
- init_waitqueue_head(&wl->fwlog_waitq);
-+ hrtimer_init(&wl->tx_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-+ wl->tx_timer.function = wl12xx_tx_timer;
-
- /* The system link is always allocated */
- __set_bit(WL12XX_SYSTEM_HLID, wl->links_map);
-diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
-index 9c00dbf..e34f095 100644
---- a/drivers/net/wireless/wl12xx/wl12xx.h
-+++ b/drivers/net/wireless/wl12xx/wl12xx.h
-@@ -275,6 +275,7 @@ enum wl12xx_flags {
- WL1271_FLAG_VIF_CHANGE_IN_PROGRESS,
- WL1271_FLAG_INTENDED_FW_RECOVERY,
- WL1271_FLAG_IO_FAILED,
-+ WL1271_FLAG_TX_TIMER_SET,
- };
-
- enum wl12xx_vif_flags {
-@@ -594,6 +595,8 @@ struct wl1271 {
-
- /* Patterns configured with set_rx_filters */
- struct cfg80211_wowlan *wowlan_patterns;
-+
-+ struct hrtimer tx_timer;
- };
-
- struct wl1271_station {
---
-1.7.9.5
-
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0001-compat-wireless-exclude-BT-building.patch b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0001-compat-wireless-exclude-BT-building.patch
deleted file mode 100644
index 731da28..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0001-compat-wireless-exclude-BT-building.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 491bf7e73abf395f2af4a914d972dc7b73af2533 Mon Sep 17 00:00:00 2001
-From: Moosa <moosab@ti.com>
-Date: Thu, 24 May 2012 11:53:07 +0300
-Subject: [PATCH 1/2] compat-wireless: exclude BT building
-
-* Exclude Bluetooth components building from compat-wireless
-
-Upstream-Status: Pending
-
-Signed-off-by: Moosa Baransi <moosab@ti.com>
----
- Makefile | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index a020661..ac75fb0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -37,8 +37,6 @@ endif
-
- endif
-
--obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/
--obj-$(CONFIG_COMPAT_BLUETOOTH_MODULES) += drivers/bluetooth/
-
- else
-
---
-1.7.1
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0001-wl12xx-detect-between-wl1271-PG-3.0-and-lower.patch b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0001-wl12xx-detect-between-wl1271-PG-3.0-and-lower.patch
deleted file mode 100644
index 13bce85..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0001-wl12xx-detect-between-wl1271-PG-3.0-and-lower.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From f100c47eff6a24a9594702dc72037773f7dd8911 Mon Sep 17 00:00:00 2001
-From: Eyal Reizer <eyalr@ti.com>
-Date: Tue, 29 May 2012 14:45:07 +0300
-Subject: [PATCH] wl12xx: detect between wl1271 PG 3.0 and lower
-
-* Detect between wl1271 PG version 3.0 and lower for using the right
- firmware with R5 based releases
-* Do not allow activating multi-role on PG 2.0(and lower)
-
-Upstream-Status: Pending
-
-Signed-off-by: Eyal Reizer <eyalr@ti.com>
----
- drivers/net/wireless/wl12xx/main.c | 22 ++++++++++++++++++++--
- 1 files changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
-index 3f05874..db50bf0 100644
---- a/drivers/net/wireless/wl12xx/main.c
-+++ b/drivers/net/wireless/wl12xx/main.c
-@@ -51,6 +51,8 @@
- #include "scan.h"
- #include "version.h"
-
-+#define WL1271_PG_VERSION_2 2
-+#define WL127X_PG20_FW_NAME_SINGLE "ti-connectivity/wl127x-fw-4-pg2-0-sr.bin"
- #define WL1271_BOOT_RETRIES 3
-
- static struct conf_drv_settings default_conf = {
-@@ -1081,8 +1083,12 @@ static int wl12xx_fetch_firmware(struct wl1271 *wl, bool plt)
- fw_type = WL12XX_FW_TYPE_NORMAL;
- if (wl->chip.id == CHIP_ID_1283_PG20)
- fw_name = WL128X_FW_NAME_SINGLE;
-- else
-- fw_name = WL127X_FW_NAME_SINGLE;
-+ else {
-+ if (wl->hw_pg_ver > WL1271_PG_VERSION_2)
-+ fw_name = WL127X_FW_NAME_SINGLE;
-+ else
-+ fw_name = WL127X_PG20_FW_NAME_SINGLE;
-+ }
- }
- }
-
-@@ -2494,6 +2500,18 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
- goto out;
- }
-
-+ /*
-+ * Only WL127x PG 3.0 supports multi-role. Do not allow bringing up more
-+ * than one interface at a time in-case of using an older version.
-+ */
-+ if ((wl->chip.id == CHIP_ID_1271_PG20) && (wl->hw_pg_ver <= WL1271_PG_VERSION_2)) {
-+ open_count = ieee80211_get_open_count(hw, vif);
-+ if (open_count) {
-+ wl1271_error("WL127x PG %d.0 doesn't support multi-role",wl->hw_pg_ver + 1);
-+ ret = -EBUSY;
-+ goto out;
-+ }
-+ }
-
- ret = wl12xx_init_vif_data(wl, vif);
- if (ret < 0)
---
-1.7.0.4
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0002-compat-wireless-enable-test-mode.patch b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0002-compat-wireless-enable-test-mode.patch
deleted file mode 100644
index 556ec8a..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0002-compat-wireless-enable-test-mode.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ca17ce77efde9a69ea4d82b86d4d51463d3e2b4a Mon Sep 17 00:00:00 2001
-From: Moosa <moosab@ti.com>
-Date: Thu, 24 May 2012 11:54:06 +0300
-Subject: [PATCH 2/2] compat-wireless: enable test mode
-
-* Enable test mode switch. Needed for the calibration process
-
-Upstream-Status: Pending
-
-Signed-off-by: Moosa Baransi <moosab@ti.com>
----
- config.mk | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/config.mk b/config.mk
-index f09d16d..65b485e 100644
---- a/config.mk
-+++ b/config.mk
-@@ -198,7 +198,7 @@ CONFIG_MAC80211_MESH=y
- CONFIG_CFG80211=m
- CONFIG_CFG80211_DEFAULT_PS=y
- # CONFIG_CFG80211_DEBUGFS=y
--# CONFIG_NL80211_TESTMODE=y
-+CONFIG_NL80211_TESTMODE=y
- # CONFIG_CFG80211_DEVELOPER_WARNINGS=y
- # CONFIG_CFG80211_REG_DEBUG=y
- # CONFIG_CFG80211_INTERNAL_REGDB=y
---
-1.7.1
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0002-ti-compat-wireless-enable-uapsd-configuration.patch b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0002-ti-compat-wireless-enable-uapsd-configuration.patch
deleted file mode 100644
index 2cd3502..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0002-ti-compat-wireless-enable-uapsd-configuration.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 74d34f0573183f3d4971fcae46ed9dadbf514626 Mon Sep 17 00:00:00 2001
-From: Eyal Reizer <eyalr@ti.com>
-Date: Sun, 12 Jun 2011 17:33:09 +0300
-Subject: [PATCH] ti-compat-wireless:enable uapsd configuration
-
-this switch activates the wlan uapsd_queues settings
-
-Signed-off-by: Eyal Reizer <eyalr@ti.com>
----
- config.mk | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/config.mk b/config.mk
-index f4cf832..a464b99 100644
---- a/config.mk
-+++ b/config.mk
-@@ -110,7 +110,7 @@ endif #CONFIG_COMPAT_KERNEL_33
- # Wireless subsystem stuff
- CONFIG_MAC80211=m
-
--# CONFIG_MAC80211_DEBUGFS=y
-+CONFIG_MAC80211_DEBUGFS=y
- # CONFIG_MAC80211_NOINLINE=y
- # CONFIG_MAC80211_VERBOSE_DEBUG=y
- # CONFIG_MAC80211_HT_DEBUG=y
---
-1.7.0.4
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0004-added-driver-version.patch b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0004-added-driver-version.patch
deleted file mode 100644
index b118166..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx-r5.00.18/0004-added-driver-version.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 6147f6523fd3e82b1bed0ea5de1c23cff808a39f Mon Sep 17 00:00:00 2001
-From: Moosa <moosa.baransi@babcomsoftware.com>
-Date: Thu, 29 Dec 2011 09:26:16 +0200
-Subject: [PATCH] added driver version
-
-* Add printing of driver version after printing FW version.
-
-Upstream-Status: Pending
-
-Signed-off-by: Moosa <moosa.baransi@babcomsoftware.com>
----
- drivers/net/wireless/wl12xx/main.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
-index aae6a74..fbf754b 100644
---- a/drivers/net/wireless/wl12xx/main.c
-+++ b/drivers/net/wireless/wl12xx/main.c
-@@ -49,6 +49,7 @@
- #include "scan.h"
-
- #define WL1271_BOOT_RETRIES 3
-+#define WLAN_DRIVER_VERSION "R5_00_18"
-
- static struct conf_drv_settings default_conf = {
- .sg = {
-@@ -2227,6 +2228,7 @@ power_off:
- wl->state = WL1271_STATE_ON;
- set_bit(WL1271_FLAG_IF_INITIALIZED, &wl->flags);
- wl1271_info("firmware booted (%s)", wl->chip.fw_ver_str);
-+ wl1271_info("Driver version: %s", WLAN_DRIVER_VERSION);
-
- /* update hw/fw version info in wiphy struct */
- wiphy->hw_version = wl->chip.id;
---
-1.7.0.4
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx_r5.00.18.bb b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx_r5.00.18.bb
deleted file mode 100644
index 6b39806..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx_r5.00.18.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-# This is a TI specific version of the compat-wireless recipe using a
-# compat-wireless package created from the TI Systems Tested mac80211 releases.
-
-DESCRIPTION = "ti compat-wireless drivers"
-HOMEPAGE = "https://gforge.ti.com/gf/project/ecs_nlcp/"
-SECTION = "kernel/modules"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
-RDEPENDS_${PN} = "wireless-tools"
-
-inherit module
-
-PR = "${MACHINE_KERNEL_PR}"
-PR_append = "a"
-
-S = "${WORKDIR}/compat-wireless"
-
-SRC_URI = "https://gforge.ti.com/gf/download/frsrelease/864/5621/ti-compat-wireless-wl12xx-2012-05-17-r5-18.tar.gz \
- file://0001-git-version-use-compat-base-tree.patch \
- file://0001-compat-wireless-add-pm_runtime_enabled.patch \
- file://0001-compat-wireless-exclude-BT-building.patch \
- file://0002-compat-wireless-enable-test-mode.patch \
- file://0004-added-driver-version.patch \
- file://0002-ti-compat-wireless-enable-uapsd-configuration.patch \
- file://0001-wl12xx-detect-between-wl1271-PG-3.0-and-lower.patch \
- file://0001-wl12xx-additional-two-members-for-wl12xx_platform_da.patch \
- "
-SRC_URI_append_am335x-evm = "file://0001-wl12xx-Decrease-number-of-RX-transactions.patch \
- file://0002-wl12xx-Decrease-number-of-TX-transactions.patch \
-"
-
-SRC_URI[md5sum] = "9b6228d2ad39ece76ec022452df59621"
-SRC_URI[sha256sum] = "c5564cbdb5d89d488be13f8d9310242597728eb1e0918ef64a6fae55dba53f5e"
-
-EXTRA_OEMAKE = "KLIB_BUILD=${STAGING_KERNEL_DIR} KLIB=${D}"
-
-do_configure() {
- cd ${S}
- ./scripts/driver-select wl12xx
-}
-
-do_configure_append() {
- sed -i "s#@./scripts/update-initramfs## " Makefile
-}
-
-do_install() {
- oe_runmake DEPMOD=echo DESTDIR="${D}" INSTALL_MOD_PATH="${D}" LDFLAGS="" install-modules
-}
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx_r5.sp4.01.bb b/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx_r5.sp4.01.bb
deleted file mode 100644
index c1d82bb..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-wireless/ti-compat-wireless-wl12xx_r5.sp4.01.bb
+++ /dev/null
@@ -1,66 +0,0 @@
-# This is a TI specific version of the compat-wireless recipe using a
-# compat-wireless package created from the TI Systems Tested mac80211 releases.
-
-DESCRIPTION = "ti compat-wireless drivers"
-HOMEPAGE = "https://gforge.ti.com/gf/project/ecs_nlcp/"
-SECTION = "kernel/modules"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
-RDEPENDS_${PN} = "wireless-tools"
-
-inherit module
-
-PR = "${MACHINE_KERNEL_PR}"
-PR_append = "e"
-
-# Tags: ol_R5.SP4.01
-SRCREV_wl12xx = "e96a68476155f1c3576066ab2d0b1417835dfdcf"
-SRCREV_compat = "984ab77279488f3fea4436da76c0f81a618cef1b"
-SRCREV_compat-wireless = "bcc169e624f54e643e182bc6c15b6380b2f8408a"
-
-SRCREV_FORMAT = "compat-wireless"
-
-S = "${WORKDIR}/compat-wireless"
-
-SRC_URI = "git://github.com/TI-OpenLink/compat-wireless.git;destsuffix=compat-wireless;name=compat-wireless \
- git://github.com/TI-OpenLink/compat.git;destsuffix=compat;name=compat \
- git://github.com/TI-OpenLink/wl12xx.git;destsuffix=wl12xx;name=wl12xx \
- file://0001-git-version-use-compat-base-tree.patch;patchdir=../wl12xx \
- file://0001-compat-wireless-add-pm_runtime_enabled.patch;patchdir=../compat \
- file://0001-wl12xx-additional-two-members-for-wl12xx_platform_da.patch;patchdir=../wl12xx \
- "
-
-SRC_URI_append_am335x-evm = "file://0001-wl12xx-Decrease-number-of-RX-transactions.patch;patchdir=../wl12xx \
- file://0002-wl12xx-Decrease-number-of-TX-transactions.patch;patchdir=../wl12xx \
-"
-
-EXTRA_OEMAKE = "KLIB_BUILD=${STAGING_KERNEL_DIR} KLIB=${D}"
-
-# Prevent sourceipk adjust_git function from running.
-# This preserves the git repo until driver-select is ran.
-
-adjust_git() {
- :
-}
-
-do_configure() {
- cd ${S}
- GIT_TREE="${WORKDIR}/wl12xx" GIT_COMPAT_TREE="${WORKDIR}/compat" ./scripts/admin-refresh.sh
-
- ./scripts/driver-select wl12xx
-
- # Delete the .git repository since it should no longer be needed.
- rm -rf ${S}/.git ${S}/.gitignore
-
- # Now generate the sourceipk with the properly configured sources
- sourceipk_do_create_srcipk
-}
-
-do_configure_append() {
- sed -i "s#@./scripts/update-initramfs## " Makefile
-}
-
-do_install() {
- oe_runmake DEPMOD=echo DESTDIR="${D}" INSTALL_MOD_PATH="${D}" LDFLAGS="" install-modules
-}
diff --git a/meta-arago-extras/recipes-bsp/wl12xx-firmware/wl12xx-firmware-r5.sp4.01/Makefile b/meta-arago-extras/recipes-bsp/wl12xx-firmware/wl12xx-firmware-r5.sp4.01/Makefile
deleted file mode 100644
index 0bb7ab8..0000000
--- a/meta-arago-extras/recipes-bsp/wl12xx-firmware/wl12xx-firmware-r5.sp4.01/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# Installs the the ti-connectiviy wlan firmware files into the root file system
-
-install:
- install -d $(DEST_DIR)/lib/firmware/ti-connectivity
- cp -RpP * $(DEST_DIR)/lib/firmware/ti-connectivity/
- rm -f $(DEST_DIR)/lib/firmware/ti-connectivity/Makefile
-
diff --git a/meta-arago-extras/recipes-bsp/wl12xx-firmware/wl12xx-firmware_r5.00.18.bb b/meta-arago-extras/recipes-bsp/wl12xx-firmware/wl12xx-firmware_r5.00.18.bb
deleted file mode 100644
index 4535c47..0000000
--- a/meta-arago-extras/recipes-bsp/wl12xx-firmware/wl12xx-firmware_r5.00.18.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "Firmware files for use with TI wl12xx"
-LICENSE = "TI-TSPA"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=ba590e1d103f891d0151609046aef9e8"
-
-PACKAGE_ARCH = "all"
-
-PR = "r1+gitr${SRCPV}"
-
-# 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"
-RPROVIDES_${PN} = "linux-firmware-wl12xx"
-
-SRCREV = "38e0dd7999b9087e00d1a59306a7c22fd23246cf"
-SRC_URI = "git://github.com/TI-ECS/ti-utils.git;protocol=git"
-
-S = "${WORKDIR}/git/hw/firmware"
-
-do_compile() {
- :
-}
-
-do_install() {
- oe_runmake 'DEST_DIR=${D}' install
-}
-
-FILES_${PN} = "/lib/firmware/ti-connectivity/*"
diff --git a/meta-arago-extras/recipes-bsp/wl12xx-firmware/wl12xx-firmware_r5.sp4.01.bb b/meta-arago-extras/recipes-bsp/wl12xx-firmware/wl12xx-firmware_r5.sp4.01.bb
deleted file mode 100644
index 2232e1c..0000000
--- a/meta-arago-extras/recipes-bsp/wl12xx-firmware/wl12xx-firmware_r5.sp4.01.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "Firmware files for use with TI wl12xx"
-LICENSE = "TI-TSPA"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=ba590e1d103f891d0151609046aef9e8"
-
-PACKAGE_ARCH = "all"
-
-PR = "r3+gitr${SRCPV}"
-
-# 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"
-RPROVIDES_${PN} = "linux-firmware-wl12xx"
-
-# Tag: ol_R5.SP4.01
-SRCREV = "c8d6b8e6ddf81091e1b1c99ebfb6751cc62b2c63"
-SRC_URI = "git://github.com/TI-OpenLink/ti-utils.git;protocol=git \
- file://Makefile \
- "
-
-S = "${WORKDIR}/git/hw/firmware"
-
-do_compile() {
- :
-}
-
-do_install() {
- cp ${WORKDIR}/Makefile ${S}
- oe_runmake 'DEST_DIR=${D}' install
-}
-
-FILES_${PN} = "/lib/firmware/ti-connectivity/*"
diff --git a/meta-arago-extras/recipes-connectivity/battleship/battleship_git.bb b/meta-arago-extras/recipes-connectivity/battleship/battleship_git.bb
deleted file mode 100644
index 545fbc7..0000000
--- a/meta-arago-extras/recipes-connectivity/battleship/battleship_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "Battleship game with wifi direct"
-SECTION = "network"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=75859989545e37968a99b631ef42722e"
-
-PR = "r8"
-
-COMPATIBLE_MACHINE = "(omap3evm|am37x-evm|am335x-evm|am180x-evm|am181x-evm)"
-
-BRANCH = "master"
-SRCREV = "b5d47f31da94545f89b0333b879b533003f5c841"
-PR_append = "+gitr${SRCPV}"
-
-SRC_URI = "git://www.github.com/TI-ECS/battleship.git;protocol=git;branch=${BRANCH} \
- file://battleship.desktop"
-
-require recipes-core/matrix/matrix-gui-paths.inc
-
-S = "${WORKDIR}/git"
-
-inherit qt4e
-
-PLATFORM_am37x-evm = "omap3evm"
-PLATFORM_omapl138 = "am1808"
-PLATFORM_am335x-evm = "am335x"
-PLATFORM ?= "UNKNOWN"
-
-do_install () {
- install -d ${D}${bindir}
- install -m 755 tmp/battleship ${D}/${bindir}/battleship
- install -d 2755 ${D}${MATRIX_APP_DIR}/battleship
- install -m 644 ${S}/data/battleship-icon.png ${D}${MATRIX_APP_DIR}/battleship
- install -m 644 ${WORKDIR}/battleship.desktop ${D}${MATRIX_APP_DIR}/battleship
-}
-
-PACKAGES += "matrix-gui-wifi-battleship-demo"
-
-FILES_${PN} +=" \
- ${bindir}/battleship \
- "
-
-RDEPENDS_${PN} += "wpa-supplicant wifi-direct-launcher"
-
-FILES_matrix-gui-wifi-battleship-demo += " \
- ${MATRIX_APP_DIR}/battleship/* \
- "
-
-RDEPENDS_matrix-gui-wifi-battleship-demo += "matrix-gui-apps-images matrix-gui-submenus-wifi ${PN}"
diff --git a/meta-arago-extras/recipes-connectivity/battleship/files/battleship.desktop b/meta-arago-extras/recipes-connectivity/battleship/files/battleship.desktop
deleted file mode 100644
index c6da1a5..0000000
--- a/meta-arago-extras/recipes-connectivity/battleship/files/battleship.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Name=Battleship
-GenericName=Demo App
-Icon=/usr/share/matrix-gui-2.0/apps/battleship/battleship-icon.png
-Type=Application
-Exec=/usr/sbin/wifi-direct-launcher.sh battleship
-Categories=wifi
-X-ProgramType=gui
diff --git a/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon-r5.00.18/0001-hostapd-change-conf-file-for-better-oob-startup.patch b/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon-r5.00.18/0001-hostapd-change-conf-file-for-better-oob-startup.patch
deleted file mode 100644
index fa68357..0000000
--- a/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon-r5.00.18/0001-hostapd-change-conf-file-for-better-oob-startup.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 4c5fe9901219956fb754306a2093e78fb460bbdd Mon Sep 17 00:00:00 2001
-From: Eyal Reizer <eyalr@ti.com>
-Date: Thu, 23 Jun 2011 10:13:44 +0300
-Subject: [PATCH] hostapd: change conf file for better sdk out of box startup
-
-The default hostapd.conf file that is fetched from upstream is using
-a band which is not supported by the 1271 chip.
-I am using this amend.inc in order to modify it to use g band and default
-channel 6 and change the ssid to a more meaningful name.
-
-Upstream-status: inappropriate [SDK specific patch]
-
-Signed-off-by: Eyal Reizer <eyalr@ti.com>
----
- hostapd/hostapd.conf | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
-index 6d7263a..bb27beb 100644
---- a/hostapd/hostapd.conf
-+++ b/hostapd/hostapd.conf
-@@ -83,7 +83,7 @@ ctrl_interface_group=0
- ##### IEEE 802.11 related configuration #######################################
-
- # SSID to be used in IEEE 802.11 management frames
--ssid=test
-+ssid=TexasInstruments_0001
-
- # Country code (ISO/IEC 3166-1). Used to set regulatory domain.
- # Set as needed to indicate country in which device is operating.
-@@ -99,14 +99,14 @@ ssid=test
-
- # Operation mode (a = IEEE 802.11a, b = IEEE 802.11b, g = IEEE 802.11g,
- # Default: IEEE 802.11b
--hw_mode=a
-+hw_mode=g
-
- # Channel number (IEEE 802.11)
- # (default: 0, i.e., not set)
- # Please note that some drivers (e.g., madwifi) do not use this value from
- # hostapd and the channel will need to be configuration separately with
- # iwconfig.
--channel=60
-+channel=6
-
- # Beacon interval in kus (1.024 ms) (default: 100; range 15..65535)
- beacon_int=100
---
-1.7.0.4
diff --git a/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon-r5.sp4.01/0001-hostapd-change-conf-file-for-better-oob-startup.patch b/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon-r5.sp4.01/0001-hostapd-change-conf-file-for-better-oob-startup.patch
deleted file mode 100644
index 562970e..0000000
--- a/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon-r5.sp4.01/0001-hostapd-change-conf-file-for-better-oob-startup.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 66b55f187843bca53cb3b7ef9c8fcd434a72f768 Mon Sep 17 00:00:00 2001
-From: Eyal Reizer <eyalr@ti.com>
-Date: Thu, 21 Feb 2013 03:55:22 -0800
-Subject: [PATCH] hostapd: change conf file for better sdk out of box startup
-
-Change the default channel to 6 and change the ssid to a more
-meaningful name.
-
-Upstream-status: inappropriate [SDK specific patch]
-
-Signed-off-by: Eyal Reizer <eyalr@ti.com>
----
- hostapd/hostapd.conf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
-index f71a881..00843aa 100644
---- a/hostapd/hostapd.conf
-+++ b/hostapd/hostapd.conf
-@@ -83,7 +83,7 @@ ctrl_interface_group=0
- ##### IEEE 802.11 related configuration #######################################
-
- # SSID to be used in IEEE 802.11 management frames
--ssid=test
-+ssid=TexasInstruments_0001
-
- # Country code (ISO/IEC 3166-1). Used to set regulatory domain.
- # Set as needed to indicate country in which device is operating.
-@@ -107,7 +107,7 @@ hw_mode=g
- # channel will need to be configured separately with iwconfig.
- # When set to 0, automatic channel selection will be engaged. A channel
- # will be selected from the desired hw_mode.
--channel=1
-+channel=6
-
- # Automatic channel selection (ACS) whitelist
- # (default: not set)
---
-1.7.9.5
-
diff --git a/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon_r5.00.18.bb b/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon_r5.00.18.bb
deleted file mode 100644
index e0c0306..0000000
--- a/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon_r5.00.18.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-# This is a TI specific version of the hostap-daemon recipe for use with the
-# wl12xx wlan and bluetooth module.
-
-require hostap.inc
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58"
-
-PR_append = "b+gitr${SRCPV}"
-
-# Tag: ol_R5.00.18
-SRCREV = "b228361c306aea007672cda115b2701907d8d685"
diff --git a/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon_r5.sp4.01.bb b/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon_r5.sp4.01.bb
deleted file mode 100644
index b3f38f8..0000000
--- a/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon_r5.sp4.01.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-# This is a TI specific version of the hostap-daemon recipe for use with the
-# wl12xx wlan and bluetooth module.
-
-require hostap.inc
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://../COPYING;md5=ab87f20cd7e8c0d0a6539b34d3791d0e"
-
-PR_append = "b+gitr${SRCPV}"
-
-# Tag: ol_R5.SP4.01
-SRCREV = "7190ff7dbd43243290b626068ded0d61c5019050"
diff --git a/meta-arago-extras/recipes-connectivity/wifi-direct-demo/files/wifi-direct-demo.desktop b/meta-arago-extras/recipes-connectivity/wifi-direct-demo/files/wifi-direct-demo.desktop
deleted file mode 100644
index 431c956..0000000
--- a/meta-arago-extras/recipes-connectivity/wifi-direct-demo/files/wifi-direct-demo.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Name=WiFi-Direct Demo
-GenericName=Demo App
-Icon=/usr/share/matrix-gui-2.0/apps/wifi-direct-demo/wifi-direct-icon.png
-Type=Application
-Exec=/usr/sbin/wifi-direct-launcher.sh wifi-direct-demo
-Categories=wifi
-X-ProgramType=gui
diff --git a/meta-arago-extras/recipes-connectivity/wifi-direct-demo/files/wifi_exit.sh b/meta-arago-extras/recipes-connectivity/wifi-direct-demo/files/wifi_exit.sh
deleted file mode 100644
index baf436b..0000000
--- a/meta-arago-extras/recipes-connectivity/wifi-direct-demo/files/wifi_exit.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-killall udhcpd
diff --git a/meta-arago-extras/recipes-connectivity/wifi-direct-demo/files/wifi_init.sh b/meta-arago-extras/recipes-connectivity/wifi-direct-demo/files/wifi_init.sh
deleted file mode 100644
index a240e20..0000000
--- a/meta-arago-extras/recipes-connectivity/wifi-direct-demo/files/wifi_init.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-if [ -z $1 ]
-then
- echo "start Client"
- udhcpc -i wlan0
-else
- echo "start Daemon"
- echo 1 > /proc/sys/net/ipv4/ip_forward
- ifconfig wlan0 192.168.0.1
- udhcpd /etc/udhcpd.conf
- iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
-fi
diff --git a/meta-arago-extras/recipes-connectivity/wifi-direct-demo/wifi-direct-demo_git.bb b/meta-arago-extras/recipes-connectivity/wifi-direct-demo/wifi-direct-demo_git.bb
deleted file mode 100644
index a36b4d1..0000000
--- a/meta-arago-extras/recipes-connectivity/wifi-direct-demo/wifi-direct-demo_git.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-DESCRIPTION = "Wifi Direct Demo"
-SECTION = "network"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=75859989545e37968a99b631ef42722e"
-
-COMPATIBLE_MACHINE = "(am37x-evm|am335x-evm|am180x-evm|am181x-evm)"
-
-PR = "r7"
-
-BRANCH = "master"
-SRCREV = "1d41618cded6d82b285e14b85b59f3320fb22469"
-
-SRC_URI = "git://www.github.com/TI-ECS/wifi-direct-demo.git;protocol=git;branch=${BRANCH} \
- file://wifi-direct-demo.desktop"
-
-require recipes-core/matrix/matrix-gui-paths.inc
-
-
-S = "${WORKDIR}/git"
-
-inherit qt4e
-
-PLATFORM_am37x-evm = "omap3evm"
-PLATFORM_omapl138 = "am1808"
-PLATFORM_am335x-evm = "am335x"
-PLATFORM ?= "UNKNOWN"
-
-do_install () {
- install -d ${D}${bindir}
- install -m 755 ${S}/scripts/wifi_init.sh ${D}${bindir}/
- install -m 755 ${S}/scripts/wifi_exit.sh ${D}${bindir}/
- install -m 755 tmp/wifi-direct-demo ${D}/${bindir}/
- install -d 2755 ${D}${MATRIX_APP_DIR}/wifi-direct-demo
- install -m 644 ${S}/images/wifi-direct-icon.png ${D}${MATRIX_APP_DIR}/wifi-direct-demo
- install -m 644 ${WORKDIR}/wifi-direct-demo.desktop ${D}${MATRIX_APP_DIR}/wifi-direct-demo
-}
-
-PACKAGES += "matrix-gui-wifi-direct-demo"
-
-FILES_${PN} +=" \
- ${bindir}/wifi-direct-demo \
- ${bindir}/wifi_init.sh \
- ${bindir}/wifi_exit.sh \
- "
-
-RDEPENDS_${PN} += "wpa-supplicant wifi-direct-launcher"
-
-FILES_matrix-gui-wifi-direct-demo += " \
- ${MATRIX_APP_DIR}/wifi-direct-demo/* \
- "
-
-RDEPENDS_matrix-gui-wifi-direct-demo += "matrix-gui-apps-images matrix-gui-submenus-wifi ${PN}"
diff --git a/meta-arago-extras/recipes-connectivity/wifi-direct-launcher/wifi-direct-launcher/wifi-direct-launcher.sh b/meta-arago-extras/recipes-connectivity/wifi-direct-launcher/wifi-direct-launcher/wifi-direct-launcher.sh
deleted file mode 100644
index 5a94d22..0000000
--- a/meta-arago-extras/recipes-connectivity/wifi-direct-launcher/wifi-direct-launcher/wifi-direct-launcher.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#check if the wpa_suppicant is already running
-#if it does, stop it.
-StationRunning=`ps | grep -c wpa_supplicant`
-if [ $StationRunning -eq 2 ]; then
- killall wpa_supplicant
-fi
-
-# Correct dbus permission. Incorrect permission causes dbus (wifi direct demos)
-# dependent demos to fail.
-chmod u+s /usr/libexec/dbus-daemon-launch-helper
-
-# start the application
-$*
diff --git a/meta-arago-extras/recipes-connectivity/wifi-direct-launcher/wifi-direct-launcher_1.0.bb b/meta-arago-extras/recipes-connectivity/wifi-direct-launcher/wifi-direct-launcher_1.0.bb
deleted file mode 100644
index 28f5590..0000000
--- a/meta-arago-extras/recipes-connectivity/wifi-direct-launcher/wifi-direct-launcher_1.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-
-inherit allarch
-
-PR ="r0"
-
-SRC_URI = "file://wifi-direct-launcher.sh"
-
-S = "${WORKDIR}"
-
-do_install() {
- install -d ${D}${sbindir}
- install -m 755 ${WORKDIR}/wifi-direct-launcher.sh ${D}${sbindir}
-}
-
-FILES_${PN} = "/usr/sbin/wifi-direct-launcher.sh"
diff --git a/meta-arago-extras/recipes-connectivity/wl12xx-demo/wl1271-demo/0001-Add-additional-hci0-up.patch b/meta-arago-extras/recipes-connectivity/wl12xx-demo/wl1271-demo/0001-Add-additional-hci0-up.patch
deleted file mode 100644
index 67603dc..0000000
--- a/meta-arago-extras/recipes-connectivity/wl12xx-demo/wl1271-demo/0001-Add-additional-hci0-up.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 3dd9df41002dd57af0c6ad8e4f6d36156b5bd2e0 Mon Sep 17 00:00:00 2001
-From: Franklin S. Cooper Jr <fcooper@ti.com>
-Date: Fri, 31 May 2013 14:05:29 -0500
-Subject: [PATCH] Add additional hci0 up
-
-* After running the Bluetooth GUI BT CLI wasn't initialized properly.
-* Adding hciconfig hci0 up statement fixes this problem.
-
-Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
----
- script/am1808/BT_Init.sh | 1 +
- script/am335x/BT_Init.sh | 1 +
- script/omap3evm/BT_Init.sh | 1 +
- 3 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/script/am1808/BT_Init.sh b/script/am1808/BT_Init.sh
-index 1645cbf..5620dc5 100755
---- a/script/am1808/BT_Init.sh
-+++ b/script/am1808/BT_Init.sh
-@@ -22,6 +22,7 @@ modprobe gpio_en
- sleep 2
- hciattach /dev/ttyS1 texas 2000000 &
- sleep 10
-+hciconfig hci0 up
- hciconfig hci0 piscan &> /dev/null
- agent --path /org/bluez/agent 0000 &> /dev/null &
- sleep 2
-diff --git a/script/am335x/BT_Init.sh b/script/am335x/BT_Init.sh
-index 0e6f714..873cc30 100755
---- a/script/am335x/BT_Init.sh
-+++ b/script/am335x/BT_Init.sh
-@@ -25,6 +25,7 @@ modprobe gpio_en
- sleep 2
- hciattach /dev/ttyO1 texas 3000000 &
- sleep 5
-+hciconfig hci0 up
- hciconfig hci0 piscan &> /dev/null
- agent --path /org/bluez/agent 0000 &> /dev/null &
- sleep 2
-diff --git a/script/omap3evm/BT_Init.sh b/script/omap3evm/BT_Init.sh
-index 0e6f714..873cc30 100755
---- a/script/omap3evm/BT_Init.sh
-+++ b/script/omap3evm/BT_Init.sh
-@@ -25,6 +25,7 @@ modprobe gpio_en
- sleep 2
- hciattach /dev/ttyO1 texas 3000000 &
- sleep 5
-+hciconfig hci0 up
- hciconfig hci0 piscan &> /dev/null
- agent --path /org/bluez/agent 0000 &> /dev/null &
- sleep 2
---
-1.7.0.4
-
diff --git a/meta-arago-extras/recipes-connectivity/wl12xx-demo/wl1271-demo_git.bb b/meta-arago-extras/recipes-connectivity/wl12xx-demo/wl1271-demo_git.bb
deleted file mode 100644
index bd728a4..0000000
--- a/meta-arago-extras/recipes-connectivity/wl12xx-demo/wl1271-demo_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "Initialization and demo application for bluetooth on WL1271 chipset"
-SECTION = "network"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=bb965abb1955d78452750ca40717999c"
-
-DEPENDS += "openobex"
-RDEPENDS_${PN} += "bluez4 openobex ussp-push obexftp bluez-hcidump obex-client"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-PACKAGE_STRIP = "no"
-
-PR = "r5+gitr${SRCPV}"
-
-BRANCH = "wl12xx"
-SRCREV = "7736f86b8c157ffc3e2a0b9e55a97c093faae14e"
-
-COMPATIBLE_MACHINE = "am37x-evm|am180x-evm|da850-omapl138-evm|am335x-evm"
-
-SRC_URI = "git://github.com/TI-ECS/wl1271-bluetooth.git;protocol=git;branch=${BRANCH} \
- file://0001-Add-additional-hci0-up.patch \
-"
-
-S = "${WORKDIR}/git"
-
-PLATFORM_am37x-evm = "omap3evm"
-PLATFORM_am180x-evm = "am1808"
-PLATFORM_da850-omapl138-evm = "am1808"
-PLATFORM_am335x-evm = "am335x"
-PLATFORM ?= "UNKNOWN"
-
-do_install () {
- install -d ${D}${datadir}/wl1271-demos
- install -d ${D}${datadir}/wl1271-demos/bluetooth
- install -d ${D}${datadir}/wl1271-demos/bluetooth/gallery
- install -d ${D}${datadir}/wl1271-demos/bluetooth/scripts
- install -d ${D}${datadir}/wl1271-demos/bluetooth/ftp_folder
-
- install -m 0755 ${S}/gallery/* ${D}${datadir}/wl1271-demos/bluetooth/gallery
- install -m 0755 ${S}/script/common/* ${D}${datadir}/wl1271-demos/bluetooth/scripts
- install -m 0755 ${S}/script/${PLATFORM}/* ${D}${datadir}/wl1271-demos/bluetooth/scripts
- install -m 0755 ${S}/ftp_folder/* ${D}${datadir}/wl1271-demos/bluetooth/ftp_folder
-}
-
-FILES_${PN} +=" \
- ${datadir}/wl1271-demos/bluetooth/scripts \
- ${datadir}/wl1271-demos/bluetooth/gallery \
- ${datadir}/wl1271-demos/bluetooth/ftp_folder \
- "
diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-r5.00.18/0001-wpa_supplicant-dbus-AP-Add-support-for-WPS-Internal-.patch b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-r5.00.18/0001-wpa_supplicant-dbus-AP-Add-support-for-WPS-Internal-.patch
deleted file mode 100644
index 15ec6fe..0000000
--- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-r5.00.18/0001-wpa_supplicant-dbus-AP-Add-support-for-WPS-Internal-.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 19030351b95f48714007e425eaa2163d9122d788 Mon Sep 17 00:00:00 2001
-From: Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
-Date: Sun, 18 Dec 2011 17:06:31 +0200
-Subject: [PATCH] wpa_supplicant/dbus AP: Add support for WPS Internal
- Registrar
-
-When in AP mode, wpa_supplicant is now enabling WPS (only Internal
-Registrar). WPS.Start() call can be used to initiate WPS negotiation
-similarly to how this is done in station mode.
-
-This was done to ctrl_iface by Jouni Malinen on April 21, 2009 (commit
-3ec97afe571f159ea95213262c1c6b89965827d4)
-
-Upstream-Status: Submitted [http://lists.shmoo.com/pipermail/hostap/2011-December/024947.html]
-
-Signed-hostap: Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
----
- wpa_supplicant/dbus/dbus_new_handlers_wps.c | 72 +++++++++++++++++++++++++--
- 1 file changed, 67 insertions(+), 5 deletions(-)
-
-diff --git a/wpa_supplicant/dbus/dbus_new_handlers_wps.c b/wpa_supplicant/dbus/dbus_new_handlers_wps.c
-index d8b74d0..a72cfb3 100644
---- a/wpa_supplicant/dbus/dbus_new_handlers_wps.c
-+++ b/wpa_supplicant/dbus/dbus_new_handlers_wps.c
-@@ -19,6 +19,8 @@
- #include "../config.h"
- #include "../wpa_supplicant_i.h"
- #include "../wps_supplicant.h"
-+#include "../driver_i.h"
-+#include "../ap.h"
- #include "dbus_new_helpers.h"
- #include "dbus_new.h"
- #include "dbus_new_handlers.h"
-@@ -30,6 +32,7 @@ struct wps_start_params {
- int type; /* 0 - not set, 1 - pin, 2 - pbc */
- u8 *bssid;
- char *pin;
-+ u8 *p2p_dev_addr;
- };
-
-
-@@ -148,6 +151,41 @@ static int wpas_dbus_handler_wps_pin(DBusMessage *message,
- }
-
-
-+#ifdef CONFIG_P2P
-+static int wpas_dbus_handler_wps_p2p_dev_addr(DBusMessage *message,
-+ DBusMessageIter *entry_iter,
-+ struct wps_start_params *params,
-+ DBusMessage **reply)
-+{
-+ DBusMessageIter variant_iter, array_iter;
-+ int len;
-+
-+ dbus_message_iter_recurse(entry_iter, &variant_iter);
-+ if (dbus_message_iter_get_arg_type(&variant_iter) != DBUS_TYPE_ARRAY ||
-+ dbus_message_iter_get_element_type(&variant_iter) !=
-+ DBUS_TYPE_BYTE) {
-+ wpa_printf(MSG_DEBUG, "dbus: WPS.Start - Wrong "
-+ "P2PDeviceAddress type, byte array required");
-+ *reply = wpas_dbus_error_invalid_args(
-+ message, "P2PDeviceAddress must be a byte array");
-+ return -1;
-+ }
-+ dbus_message_iter_recurse(&variant_iter, &array_iter);
-+ dbus_message_iter_get_fixed_array(&array_iter, ¶ms->p2p_dev_addr,
-+ &len);
-+ if (len != ETH_ALEN) {
-+ wpa_printf(MSG_DEBUG, "dbus: WPS.Start - Wrong "
-+ "P2PDeviceAddress length %d", len);
-+ *reply = wpas_dbus_error_invalid_args(message,
-+ "P2PDeviceAddress "
-+ "has wrong length");
-+ return -1;
-+ }
-+ return 0;
-+}
-+#endif /* CONFIG_P2P */
-+
-+
- static int wpas_dbus_handler_wps_start_entry(DBusMessage *message, char *key,
- DBusMessageIter *entry_iter,
- struct wps_start_params *params,
-@@ -165,6 +203,11 @@ static int wpas_dbus_handler_wps_start_entry(DBusMessage *message, char *key,
- else if (os_strcmp(key, "Pin") == 0)
- return wpas_dbus_handler_wps_pin(message, entry_iter,
- params, reply);
-+#ifdef CONFIG_P2P
-+ else if (os_strcmp(key, "P2PDeviceAddress") == 0)
-+ return wpas_dbus_handler_wps_p2p_dev_addr(message, entry_iter,
-+ params, reply);
-+#endif /* CONFIG_P2P */
-
- wpa_printf(MSG_DEBUG, "dbus: WPS.Start - unknown key %s", key);
- *reply = wpas_dbus_error_invalid_args(message, key);
-@@ -231,12 +274,31 @@ DBusMessage * wpas_dbus_handler_wps_start(DBusMessage *message,
- ret = wpas_wps_start_reg(wpa_s, params.bssid, params.pin,
- NULL);
- else if (params.type == 1) {
-- ret = wpas_wps_start_pin(wpa_s, params.bssid, params.pin, 0,
-- DEV_PW_DEFAULT);
-- if (ret > 0)
-- os_snprintf(npin, sizeof(npin), "%08d", ret);
-- } else
-+#ifdef CONFIG_AP
-+ if (wpa_s->ap_iface)
-+ ret = wpa_supplicant_ap_wps_pin(wpa_s,
-+ params.bssid,
-+ params.pin,
-+ npin, sizeof(npin));
-+ else
-+#endif /* CONFIG_AP */
-+ {
-+ ret = wpas_wps_start_pin(wpa_s, params.bssid,
-+ params.pin, 0,
-+ DEV_PW_DEFAULT);
-+ if (ret > 0)
-+ os_snprintf(npin, sizeof(npin), "%08d", ret);
-+ }
-+ } else {
-+#ifdef CONFIG_AP
-+ if (wpa_s->ap_iface)
-+ ret = wpa_supplicant_ap_wps_pbc(wpa_s,
-+ params.bssid,
-+ params.p2p_dev_addr);
-+ else
-+#endif /* CONFIG_AP */
- ret = wpas_wps_start_pbc(wpa_s, params.bssid, 0);
-+ }
-
- if (ret < 0) {
- wpa_printf(MSG_DEBUG, "dbus: WPS.Start wpas_wps_failed in "
---
-1.7.10
diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-r5.00.18/defconfig b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-r5.00.18/defconfig
deleted file mode 100755
index 9b9882a..0000000
--- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-r5.00.18/defconfig
+++ /dev/null
@@ -1,426 +0,0 @@
-# Example wpa_supplicant build time configuration
-#
-# This file lists the configuration options that are used when building the
-# hostapd binary. All lines starting with # are ignored. Configuration option
-# lines must be commented out complete, if they are not to be included, i.e.,
-# just setting VARIABLE=n is not disabling that variable.
-#
-# This file is included in Makefile, so variables like CFLAGS and LIBS can also
-# be modified from here. In most cases, these lines should use += in order not
-# to override previous values of the variables.
-
-
-# Uncomment following two lines and fix the paths if you have installed OpenSSL
-# or GnuTLS in non-default location
-#CFLAGS += -I/usr/local/openssl/include
-#LIBS += -L/usr/local/openssl/lib
-
-# Some Red Hat versions seem to include kerberos header files from OpenSSL, but
-# the kerberos files are not in the default include path. Following line can be
-# used to fix build issues on such systems (krb5.h not found).
-#CFLAGS += -I/usr/include/kerberos
-
-# Example configuration for various cross-compilation platforms
-
-#### sveasoft (e.g., for Linksys WRT54G) ######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
-#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
-###############################################################################
-
-#### openwrt (e.g., for Linksys WRT54G) #######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
-# -I../WRT54GS/release/src/include
-#LIBS = -lssl
-###############################################################################
-
-#CC=$(CROSS_COMPILE)gcc
-#CFLAGS += -DCONFIG_LIBNL20
-#CPPFLAGS += -DCONFIG_LIBNL20
-#LIBS += -L$(NFSROOT)/lib -lnl
-#LIBS_p += -L$(NFSROOT)/lib
-#LIBDIR = $(NFSROOT)/lib
-#BINDIR = $(NFSROOT)/usr/sbin
-
-CONFIG_WAPI=y
-CONFIG_LIBNL20=y
-NEED_BGSCAN=y
-CONFIG_BGSCAN_LEARN=y
-
-# Driver interface for Host AP driver
-#CONFIG_DRIVER_HOSTAP=y
-
-# Driver interface for Agere driver
-#CONFIG_DRIVER_HERMES=y
-# Change include directories to match with the local setup
-#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
-#CFLAGS += -I../../include/wireless
-
-# Driver interface for madwifi driver
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_MADWIFI=y
-# Set include directory to the madwifi source tree
-#CFLAGS += -I../../madwifi
-
-# Driver interface for ndiswrapper
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_NDISWRAPPER=y
-
-# Driver interface for Atmel driver
-#CONFIG_DRIVER_ATMEL=y
-
-# Driver interface for old Broadcom driver
-# Please note that the newer Broadcom driver ("hybrid Linux driver") supportsBG
-# Linux wireless extensions and does not need (or even work) with the old
-# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver.
-#CONFIG_DRIVER_BROADCOM=y
-# Example path for wlioctl.h; change to match your configuration
-#CFLAGS += -I/opt/WRT54GS/release/src/include
-
-# Driver interface for Intel ipw2100/2200 driver
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_IPW=y
-
-# Driver interface for Ralink driver
-#CONFIG_DRIVER_RALINK=y
-
-# Driver interface for generic Linux wireless extensions
-CONFIG_DRIVER_WEXT=y
-
-# Driver interface for Linux drivers using the nl80211 kernel interface
-CONFIG_DRIVER_NL80211=y
-
-# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
-#CONFIG_DRIVER_BSD=y
-#CFLAGS += -I/usr/local/include
-#LIBS += -L/usr/local/lib
-#LIBS_p += -L/usr/local/libBG
-#LIBS_c += -L/usr/local/lib
-
-# Driver interface for Windows NDIS
-#CONFIG_DRIVER_NDIS=y
-#CFLAGS += -I/usr/include/w32api/ddk
-#LIBS += -L/usr/local/lib
-# For native build using mingw
-#CONFIG_NATIVE_WINDOWS=y
-# Additional directories for cross-compilation on Linux host for mingw target
-#CFLAGS += -I/opt/mingw/mingw32/include/ddk
-#LIBS += -L/opt/mingw/mingw32/lib
-#CC=mingw32-gcc
-# By default, driver_ndis uses WinPcap for low-level operations. This can be
-# replaced with the following option which replaces WinPcap calls with NDISUIO.
-# However, this requires that WZC is disabled (net stop wzcsvc) before starting
-# wpa_supplicant.
-# CONFIG_USE_NDISUIO=y
-
-# Driver interface for development testing
-#CONFIG_DRIVER_TEST=y
-
-# Include client MLME (management frame processing) for test driver
-# This can be used to test MLME operations in hostapd with the test interface.
-# space.
-#CONFIG_CLIENT_MLME=y
-
-# Driver interface for wired Ethernet drivers
-CONFIG_DRIVER_WIRED=y
-
-# Driver interface for the Broadcom RoboSwitch family
-#CONFIG_DRIVER_ROBOSWITCH=y
-
-# Driver interface for no driver (e.g., WPS ER only)
-#CONFIG_DRIVER_NONE=y
-
-# Solaris libraries
-#LIBS += -lsocket -ldlpi -lnsl
-#LIBS_c += -lsocket
-
-# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
-# included)
-CONFIG_IEEE8021X_EAPOL=y
-
-# EAP-MD5
-CONFIG_EAP_MD5=y
-
-# EAP-MSCHAPv2
-CONFIG_EAP_MSCHAPV2=y
-
-# EAP-TLS
-CONFIG_EAP_TLS=y
-
-# EAL-PEAP
-CONFIG_EAP_PEAP=y
-
-# EAP-TTLS
-CONFIG_EAP_TTLS=y
-
-# EAP-FAST
-# Note: Default OpenSSL package does not include support for all the
-# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
-# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch)
-# to add the needed functions.
-#CONFIG_EAP_FAST=y
-
-# EAP-GTC
-CONFIG_EAP_GTC=y
-
-# EAP-OTP
-CONFIG_EAP_OTP=y
-
-# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
-#CONFIG_EAP_SIM=y
-
-# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
-#CONFIG_EAP_PSK=y
-
-# EAP-PAX
-#CONFIG_EAP_PAX=y
-
-# LEAP
-CONFIG_EAP_LEAP=y
-
-# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
-#CONFIG_EAP_AKA=y
-
-# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used).
-# This requires CONFIG_EAP_AKA to be enabled, too.
-#CONFIG_EAP_AKA_PRIME=y
-
-# Enable USIM simulator (Milenage) for EAP-AKA
-#CONFIG_USIM_SIMULATOR=y
-
-# EAP-SAKE
-#CONFIG_EAP_SAKE=y
-
-# EAP-GPSK
-#CONFIG_EAP_GPSK=y
-# Include support for optional SHA256 cipher suite in EAP-GPSK
-#CONFIG_EAP_GPSK_SHA256=y
-
-# EAP-TNC and related Trusted Network Connect support (experimental)
-#CONFIG_EAP_TNC=y
-
-# Wi-Fi Protected Setup (WPS)
-CONFIG_WPS=y
-# Enable WSC 2.0 support
-CONFIG_WPS2=y
-
-# EAP-IKEv2
-#CONFIG_EAP_IKEV2=y
-
-# PKCS#12 (PFX) support (used to read private key and certificate file from
-# a file that usually has extension .p12 or .pfx)
-CONFIG_PKCS12=y
-
-# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
-# engine.
-CONFIG_SMARTCARD=y
-
-# PC/SC interface for smartcards (USIM, GSM SIM)
-# Enable this if EAP-SIM or EAP-AKA is included
-#CONFIG_PCSC=y
-
-# Development testingBG
-#CONFIG_EAPOL_TEST=y
-
-# Select control interface backend for external programs, e.g, wpa_cli:
-# unix = UNIX domain sockets (default for Linux/*BSD)
-# udp = UDP sockets using localhost (127.0.0.1)
-# named_pipe = Windows Named Pipe (default for Windows)
-# y = use default (backwards compatibility)
-# If this option is commented out, control interface is not included in the
-# build.
-CONFIG_CTRL_IFACE=y
-
-# Include support for GNU Readline and History Libraries in wpa_cli.
-# When building a wpa_cli binary for distribution, please note that these
-# libraries are licensed under GPL and as such, BSD license may not apply for
-# the resulting binary.
-#CONFIG_READLINE=y
-
-# Remove debugging code that is printing out debug message to stdout.
-# This can be used to reduce the size of the wpa_supplicant considerably
-# if debugging code is not needed. The size reduction can be around 35%
-# (e.g., 90 kB).
-#CONFIG_NO_STDOUT_DEBUG=y
-
-# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
-# 35-50 kB in code size.
-#CONFIG_NO_WPA=y
-
-# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to
-# save about 1 kB in code size when building only WPA-Personal (no EAP support)
-# or 6 kB if building for WPA-Enterprise.
-#CONFIG_NO_WPA2=y
-
-# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support
-# This option can be used to reduce code size by removing support for
-# converting ASCII passphrases into PSK. If this functionality is removed, the
-# PSK can only be configured as the 64-octet hexstring (e.g., from
-# wpa_passphrase). This saves about 0.5 kB in code size.
-#CONFIG_NO_WPA_PASSPHRASE=y
-
-# Disable scan result processing (ap_mode=1) to save code size by about 1 kB.
-# This can be used if ap_scan=1 mode is never enabled.
-#CONFIG_NO_SCAN_PROCESSING=y
-
-# Select configuration backend:
-# file = text file (e.g., wpa_supplicant.conf; note: the configuration file
-# path is given on command line, not here; this option is just used to
-# select the backend that allows configuration files to be used)
-# winreg = Windows registry (see win_example.reg for an example)
-CONFIG_BACKEND=file
-
-# Remove configuration write functionality (i.e., to allow the configuration
-# file to be updated based on runtime configuration changes). The runtime
-# configuration can still be changed, the changes are just not going to be
-# persistent over restarts. This option can be used to reduce code size by
-# about 3.5 kB.
-#CONFIG_NO_CONFIG_WRITE=y
-
-# Remove support for configuration blobs to reduce code size by about 1.5 kB.
-#CONFIG_NO_CONFIG_BLOBS=y
-
-# Select program entry point implementation:
-# main = UNIX/POSIX like main() function (default)
-# main_winsvc = Windows service (read parameters from registry)
-# main_none = Very basic example (development use only)
-#CONFIG_MAIN=main
-
-# Select wrapper for operatins system and C library specific functions
-# unix = UNIX/POSIX like systems (default)
-# win32 = Windows systems
-# none = Empty template
-#CONFIG_OS=unix
-
-# Select event loop implementation
-# eloop = select() loop (default)
-# eloop_win = Windows events and WaitForMultipleObject() loop
-# eloop_none = Empty template
-#CONFIG_ELOOP=eloop
-
-# Select layer 2 packet implementation
-# linux = Linux packet socket (default)
-# pcap = libpcap/libdnet/WinPcap
-# freebsd = FreeBSD libpcap
-# winpcap = WinPcap with receive thread
-# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
-# none = Empty template
-#CONFIG_L2_PACKET=linux
-
-# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
-CONFIG_PEERKEY=y
-
-# IEEE 802.11w (management frame protection)
-# This version is an experimental implementation based on IEEE 802.11w/D1.0
-# draft and is subject to change since the standard has not yet been finalized.
-# Driver support is also needed for IEEE 802.11w.
-#CONFIG_IEEE80211W=y
-
-# Select TLS implementation
-# openssl = OpenSSL (default)
-# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
-# internal = Internal TLSv1 implementation (experimental)
-# none = Empty template
-#CONFIG_TLS=openssl
-
-# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
-# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
-# even though the core GnuTLS library is released under LGPL, this extra
-# library uses GPL and as such, the terms of GPL apply to the combination
-# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
-# apply for distribution of the resulting binary.
-#CONFIG_GNUTLS_EXTRA=y
-
-# If CONFIG_TLS=internal is used, additional library and include paths are
-# needed for LibTomMath. Alternatively, an integrated, minimal version of
-# LibTomMath can be used. See beginning of libtommath.c for details on benefits
-# and drawbacks of this option.
-#CONFIG_INTERNAL_LIBTOMMATH=y
-#ifndef CONFIG_INTERNAL_LIBTOMMATH
-#LTM_PATH=/usr/src/libtommath-0.39
-#CFLAGS += -I$(LTM_PATH)
-#LIBS += -L$(LTM_PATH)
-#LIBS_p += -L$(LTM_PATH)
-#endif
-# At the cost of about 4 kB of additional binary size, the internal LibTomMath
-# can be configured to include faster routines for exptmod, sqr, and div to
-# speed up DH and RSA calculation considerably
-#CONFIG_INTERNAL_LIBTOMMATH_FAST=y
-
-# Include NDIS event processing through WMI into wpa_supplicant/wpasvc.
-# This is only for Windows builds and requires WMI-related header files and
-# WbemUuid.Lib from Platform SDK even when building with MinGW.
-#CONFIG_NDIS_EVENTS_INTEGRATED=y
-#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
-
-# Add support for old DBus control interface
-# (fi.epitest.hostap.WPASupplicant)
-CONFIG_CTRL_IFACE_DBUS=y
-
-# Add support for new DBus control interface
-# (fi.w1.hostap.wpa_supplicant1)
-CONFIG_CTRL_IFACE_DBUS_NEW=y
-
-# Add introspection support for new DBus control interface
-CONFIG_CTRL_IFACE_DBUS_INTRO=y
-
-# Add support for loading EAP methods dynamically as shared libraries.
-# When this option is enabled, each EAP method can be either included
-# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
-# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to
-# be loaded in the beginning of the wpa_supplicant configuration file
-# (see load_dynamic_eap parameter in the example file) before being used in
-# the network blocks.
-#
-# Note that some shared parts of EAP methods are included in the main program
-# and in order to be able to use dynamic EAP methods using these parts, the
-# main program must have been build with the EAP method enabled (=y or =dyn).
-# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries
-# unless at least one of them was included in the main build to force inclusion
-# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included
-# in the main build to be able to load these methods dynamically.
-#
-# Please also note that using dynamic libraries will increase the total binary
-# size. Thus, it may not be the best option for targets that have limited
-# amount of memory/flash.
-#CONFIG_DYNAMIC_EAP_METHODS=y
-
-# IEEE Std 802.11r-2008 (Fast BSS Transition)
-#CONFIG_IEEE80211R=y
-
-# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
-CONFIG_DEBUG_FILE=y
-
-# Enable privilege separation (see README 'Privilege separation' for details)
-#CONFIG_PRIVSEP=y
-
-# Enable mitigation against certain attacks against TKIP by delaying Michael
-# MIC error reports by a random amount of time between 0 and 60 seconds
-#CONFIG_DELAYED_MIC_ERROR_REPORT=y
-
-# Enable tracing code for developer debugging
-# This tracks use of memory allocations and other registrations and reports
-# incorrect use with a backtrace of call (or allocation) location.
-#CONFIG_WPA_TRACE=y
-# For BSD, comment out these.
-#LIBS += -lexecinfo
-#LIBS_p += -lexecinfo
-#LIBS_c += -lexecinfo
-
-# Use libbfd to get more details for developer debugging
-# This enables use of libbfd to get more detailed symbols for the backtraces
-# generated by CONFIG_WPA_TRACE=y.
-#CONFIG_WPA_TRACE_BFD=y
-# For BSD, comment out these.
-#LIBS += -lbfd -liberty -lz
-#LIBS_p += -lbfd -liberty -lz
-#LIBS_c += -lbfd -liberty -lz
-
-# for p2p
-CONFIG_P2P=y
-CONFIG_AP=y
diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-r5.sp4.01/defconfig b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-r5.sp4.01/defconfig
deleted file mode 100755
index b982e2a..0000000
--- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-r5.sp4.01/defconfig
+++ /dev/null
@@ -1,430 +0,0 @@
-# Example wpa_supplicant build time configuration
-#
-# This file lists the configuration options that are used when building the
-# hostapd binary. All lines starting with # are ignored. Configuration option
-# lines must be commented out complete, if they are not to be included, i.e.,
-# just setting VARIABLE=n is not disabling that variable.
-#
-# This file is included in Makefile, so variables like CFLAGS and LIBS can also
-# be modified from here. In most cases, these lines should use += in order not
-# to override previous values of the variables.
-
-
-# Uncomment following two lines and fix the paths if you have installed OpenSSL
-# or GnuTLS in non-default location
-#CFLAGS += -I/usr/local/openssl/include
-#LIBS += -L/usr/local/openssl/lib
-
-# Some Red Hat versions seem to include kerberos header files from OpenSSL, but
-# the kerberos files are not in the default include path. Following line can be
-# used to fix build issues on such systems (krb5.h not found).
-#CFLAGS += -I/usr/include/kerberos
-
-# Example configuration for various cross-compilation platforms
-
-#### sveasoft (e.g., for Linksys WRT54G) ######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
-#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
-###############################################################################
-
-#### openwrt (e.g., for Linksys WRT54G) #######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
-# -I../WRT54GS/release/src/include
-#LIBS = -lssl
-###############################################################################
-
-#CC=$(CROSS_COMPILE)gcc
-#CFLAGS += -DCONFIG_LIBNL20
-#CPPFLAGS += -DCONFIG_LIBNL20
-#LIBS += -L$(NFSROOT)/lib -lnl
-#LIBS_p += -L$(NFSROOT)/lib
-#LIBDIR = $(NFSROOT)/lib
-#BINDIR = $(NFSROOT)/usr/sbin
-
-CONFIG_WAPI=y
-CONFIG_LIBNL20=y
-NEED_BGSCAN=y
-CONFIG_BGSCAN_LEARN=y
-
-# Driver interface for Host AP driver
-#CONFIG_DRIVER_HOSTAP=y
-
-# Driver interface for Agere driver
-#CONFIG_DRIVER_HERMES=y
-# Change include directories to match with the local setup
-#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
-#CFLAGS += -I../../include/wireless
-
-# Driver interface for madwifi driver
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_MADWIFI=y
-# Set include directory to the madwifi source tree
-#CFLAGS += -I../../madwifi
-
-# Driver interface for ndiswrapper
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_NDISWRAPPER=y
-
-# Driver interface for Atmel driver
-#CONFIG_DRIVER_ATMEL=y
-
-# Driver interface for old Broadcom driver
-# Please note that the newer Broadcom driver ("hybrid Linux driver") supportsBG
-# Linux wireless extensions and does not need (or even work) with the old
-# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver.
-#CONFIG_DRIVER_BROADCOM=y
-# Example path for wlioctl.h; change to match your configuration
-#CFLAGS += -I/opt/WRT54GS/release/src/include
-
-# Driver interface for Intel ipw2100/2200 driver
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_IPW=y
-
-# Driver interface for Ralink driver
-#CONFIG_DRIVER_RALINK=y
-
-# Driver interface for generic Linux wireless extensions
-CONFIG_DRIVER_WEXT=y
-
-# Driver interface for Linux drivers using the nl80211 kernel interface
-CONFIG_DRIVER_NL80211=y
-
-# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
-#CONFIG_DRIVER_BSD=y
-#CFLAGS += -I/usr/local/include
-#LIBS += -L/usr/local/lib
-#LIBS_p += -L/usr/local/libBG
-#LIBS_c += -L/usr/local/lib
-
-# Driver interface for Windows NDIS
-#CONFIG_DRIVER_NDIS=y
-#CFLAGS += -I/usr/include/w32api/ddk
-#LIBS += -L/usr/local/lib
-# For native build using mingw
-#CONFIG_NATIVE_WINDOWS=y
-# Additional directories for cross-compilation on Linux host for mingw target
-#CFLAGS += -I/opt/mingw/mingw32/include/ddk
-#LIBS += -L/opt/mingw/mingw32/lib
-#CC=mingw32-gcc
-# By default, driver_ndis uses WinPcap for low-level operations. This can be
-# replaced with the following option which replaces WinPcap calls with NDISUIO.
-# However, this requires that WZC is disabled (net stop wzcsvc) before starting
-# wpa_supplicant.
-# CONFIG_USE_NDISUIO=y
-
-# Driver interface for development testing
-#CONFIG_DRIVER_TEST=y
-
-# Include client MLME (management frame processing) for test driver
-# This can be used to test MLME operations in hostapd with the test interface.
-# space.
-#CONFIG_CLIENT_MLME=y
-
-# Driver interface for wired Ethernet drivers
-CONFIG_DRIVER_WIRED=y
-
-# Driver interface for the Broadcom RoboSwitch family
-#CONFIG_DRIVER_ROBOSWITCH=y
-
-# Driver interface for no driver (e.g., WPS ER only)
-#CONFIG_DRIVER_NONE=y
-
-# Solaris libraries
-#LIBS += -lsocket -ldlpi -lnsl
-#LIBS_c += -lsocket
-
-# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
-# included)
-CONFIG_IEEE8021X_EAPOL=y
-
-# EAP-MD5
-CONFIG_EAP_MD5=y
-
-# EAP-MSCHAPv2
-CONFIG_EAP_MSCHAPV2=y
-
-# EAP-TLS
-CONFIG_EAP_TLS=y
-
-# EAL-PEAP
-CONFIG_EAP_PEAP=y
-
-# EAP-TTLS
-CONFIG_EAP_TTLS=y
-
-# EAP-FAST
-# Note: Default OpenSSL package does not include support for all the
-# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
-# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch)
-# to add the needed functions.
-#CONFIG_EAP_FAST=y
-
-# EAP-GTC
-CONFIG_EAP_GTC=y
-
-# EAP-OTP
-CONFIG_EAP_OTP=y
-
-# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
-#CONFIG_EAP_SIM=y
-
-# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
-#CONFIG_EAP_PSK=y
-
-# EAP-PAX
-#CONFIG_EAP_PAX=y
-
-# LEAP
-CONFIG_EAP_LEAP=y
-
-# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
-#CONFIG_EAP_AKA=y
-
-# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used).
-# This requires CONFIG_EAP_AKA to be enabled, too.
-#CONFIG_EAP_AKA_PRIME=y
-
-# Enable USIM simulator (Milenage) for EAP-AKA
-#CONFIG_USIM_SIMULATOR=y
-
-# EAP-SAKE
-#CONFIG_EAP_SAKE=y
-
-# EAP-GPSK
-#CONFIG_EAP_GPSK=y
-# Include support for optional SHA256 cipher suite in EAP-GPSK
-#CONFIG_EAP_GPSK_SHA256=y
-
-# EAP-TNC and related Trusted Network Connect support (experimental)
-#CONFIG_EAP_TNC=y
-
-# Wi-Fi Protected Setup (WPS)
-CONFIG_WPS=y
-# Enable WSC 2.0 support
-CONFIG_WPS2=y
-
-# EAP-IKEv2
-#CONFIG_EAP_IKEV2=y
-
-# PKCS#12 (PFX) support (used to read private key and certificate file from
-# a file that usually has extension .p12 or .pfx)
-CONFIG_PKCS12=y
-
-# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
-# engine.
-CONFIG_SMARTCARD=y
-
-# PC/SC interface for smartcards (USIM, GSM SIM)
-# Enable this if EAP-SIM or EAP-AKA is included
-#CONFIG_PCSC=y
-
-# Development testingBG
-#CONFIG_EAPOL_TEST=y
-
-# Select control interface backend for external programs, e.g, wpa_cli:
-# unix = UNIX domain sockets (default for Linux/*BSD)
-# udp = UDP sockets using localhost (127.0.0.1)
-# named_pipe = Windows Named Pipe (default for Windows)
-# y = use default (backwards compatibility)
-# If this option is commented out, control interface is not included in the
-# build.
-CONFIG_CTRL_IFACE=y
-
-# Include support for GNU Readline and History Libraries in wpa_cli.
-# When building a wpa_cli binary for distribution, please note that these
-# libraries are licensed under GPL and as such, BSD license may not apply for
-# the resulting binary.
-#CONFIG_READLINE=y
-
-# Remove debugging code that is printing out debug message to stdout.
-# This can be used to reduce the size of the wpa_supplicant considerably
-# if debugging code is not needed. The size reduction can be around 35%
-# (e.g., 90 kB).
-#CONFIG_NO_STDOUT_DEBUG=y
-
-# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
-# 35-50 kB in code size.
-#CONFIG_NO_WPA=y
-
-# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to
-# save about 1 kB in code size when building only WPA-Personal (no EAP support)
-# or 6 kB if building for WPA-Enterprise.
-#CONFIG_NO_WPA2=y
-
-# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support
-# This option can be used to reduce code size by removing support for
-# converting ASCII passphrases into PSK. If this functionality is removed, the
-# PSK can only be configured as the 64-octet hexstring (e.g., from
-# wpa_passphrase). This saves about 0.5 kB in code size.
-#CONFIG_NO_WPA_PASSPHRASE=y
-
-# Disable scan result processing (ap_mode=1) to save code size by about 1 kB.
-# This can be used if ap_scan=1 mode is never enabled.
-#CONFIG_NO_SCAN_PROCESSING=y
-
-# Select configuration backend:
-# file = text file (e.g., wpa_supplicant.conf; note: the configuration file
-# path is given on command line, not here; this option is just used to
-# select the backend that allows configuration files to be used)
-# winreg = Windows registry (see win_example.reg for an example)
-CONFIG_BACKEND=file
-
-# Remove configuration write functionality (i.e., to allow the configuration
-# file to be updated based on runtime configuration changes). The runtime
-# configuration can still be changed, the changes are just not going to be
-# persistent over restarts. This option can be used to reduce code size by
-# about 3.5 kB.
-#CONFIG_NO_CONFIG_WRITE=y
-
-# Remove support for configuration blobs to reduce code size by about 1.5 kB.
-#CONFIG_NO_CONFIG_BLOBS=y
-
-# Select program entry point implementation:
-# main = UNIX/POSIX like main() function (default)
-# main_winsvc = Windows service (read parameters from registry)
-# main_none = Very basic example (development use only)
-#CONFIG_MAIN=main
-
-# Select wrapper for operatins system and C library specific functions
-# unix = UNIX/POSIX like systems (default)
-# win32 = Windows systems
-# none = Empty template
-#CONFIG_OS=unix
-
-# Select event loop implementation
-# eloop = select() loop (default)
-# eloop_win = Windows events and WaitForMultipleObject() loop
-# eloop_none = Empty template
-#CONFIG_ELOOP=eloop
-
-# Select layer 2 packet implementation
-# linux = Linux packet socket (default)
-# pcap = libpcap/libdnet/WinPcap
-# freebsd = FreeBSD libpcap
-# winpcap = WinPcap with receive thread
-# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
-# none = Empty template
-#CONFIG_L2_PACKET=linux
-
-# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
-CONFIG_PEERKEY=y
-
-# IEEE 802.11w (management frame protection)
-# This version is an experimental implementation based on IEEE 802.11w/D1.0
-# draft and is subject to change since the standard has not yet been finalized.
-# Driver support is also needed for IEEE 802.11w.
-#CONFIG_IEEE80211W=y
-
-# Select TLS implementation
-# openssl = OpenSSL (default)
-# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
-# internal = Internal TLSv1 implementation (experimental)
-# none = Empty template
-#CONFIG_TLS=openssl
-
-# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
-# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
-# even though the core GnuTLS library is released under LGPL, this extra
-# library uses GPL and as such, the terms of GPL apply to the combination
-# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
-# apply for distribution of the resulting binary.
-#CONFIG_GNUTLS_EXTRA=y
-
-# If CONFIG_TLS=internal is used, additional library and include paths are
-# needed for LibTomMath. Alternatively, an integrated, minimal version of
-# LibTomMath can be used. See beginning of libtommath.c for details on benefits
-# and drawbacks of this option.
-#CONFIG_INTERNAL_LIBTOMMATH=y
-#ifndef CONFIG_INTERNAL_LIBTOMMATH
-#LTM_PATH=/usr/src/libtommath-0.39
-#CFLAGS += -I$(LTM_PATH)
-#LIBS += -L$(LTM_PATH)
-#LIBS_p += -L$(LTM_PATH)
-#endif
-# At the cost of about 4 kB of additional binary size, the internal LibTomMath
-# can be configured to include faster routines for exptmod, sqr, and div to
-# speed up DH and RSA calculation considerably
-#CONFIG_INTERNAL_LIBTOMMATH_FAST=y
-
-# Include NDIS event processing through WMI into wpa_supplicant/wpasvc.
-# This is only for Windows builds and requires WMI-related header files and
-# WbemUuid.Lib from Platform SDK even when building with MinGW.
-#CONFIG_NDIS_EVENTS_INTEGRATED=y
-#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
-
-# Add support for old DBus control interface
-# (fi.epitest.hostap.WPASupplicant)
-CONFIG_CTRL_IFACE_DBUS=y
-
-# Add support for new DBus control interface
-# (fi.w1.hostap.wpa_supplicant1)
-CONFIG_CTRL_IFACE_DBUS_NEW=y
-
-# Add introspection support for new DBus control interface
-CONFIG_CTRL_IFACE_DBUS_INTRO=y
-
-# Add support for loading EAP methods dynamically as shared libraries.
-# When this option is enabled, each EAP method can be either included
-# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
-# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to
-# be loaded in the beginning of the wpa_supplicant configuration file
-# (see load_dynamic_eap parameter in the example file) before being used in
-# the network blocks.
-#
-# Note that some shared parts of EAP methods are included in the main program
-# and in order to be able to use dynamic EAP methods using these parts, the
-# main program must have been build with the EAP method enabled (=y or =dyn).
-# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries
-# unless at least one of them was included in the main build to force inclusion
-# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included
-# in the main build to be able to load these methods dynamically.
-#
-# Please also note that using dynamic libraries will increase the total binary
-# size. Thus, it may not be the best option for targets that have limited
-# amount of memory/flash.
-#CONFIG_DYNAMIC_EAP_METHODS=y
-
-# IEEE Std 802.11r-2008 (Fast BSS Transition)
-#CONFIG_IEEE80211R=y
-
-# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
-CONFIG_DEBUG_FILE=y
-
-# Enable privilege separation (see README 'Privilege separation' for details)
-#CONFIG_PRIVSEP=y
-
-# Enable mitigation against certain attacks against TKIP by delaying Michael
-# MIC error reports by a random amount of time between 0 and 60 seconds
-#CONFIG_DELAYED_MIC_ERROR_REPORT=y
-
-# Enable tracing code for developer debugging
-# This tracks use of memory allocations and other registrations and reports
-# incorrect use with a backtrace of call (or allocation) location.
-#CONFIG_WPA_TRACE=y
-# For BSD, comment out these.
-#LIBS += -lexecinfo
-#LIBS_p += -lexecinfo
-#LIBS_c += -lexecinfo
-
-# Use libbfd to get more details for developer debugging
-# This enables use of libbfd to get more detailed symbols for the backtraces
-# generated by CONFIG_WPA_TRACE=y.
-#CONFIG_WPA_TRACE_BFD=y
-# For BSD, comment out these.
-#LIBS += -lbfd -liberty -lz
-#LIBS_p += -lbfd -liberty -lz
-#LIBS_c += -lbfd -liberty -lz
-
-# for p2p
-CONFIG_P2P=y
-CONFIG_AP=y
-
-# IEEE 802.11n (High Throughput) support
-CONFIG_IEEE80211N=y
-
diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant_r5.00.18.bb b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant_r5.00.18.bb
deleted file mode 100644
index b8c2d51..0000000
--- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant_r5.00.18.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-# This is a TI specific version of the wpa-supplicant recipe for use with the
-# wl12xx wlan and bluetooth module.
-
-require wpa-supplicant.inc
-
-LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
- file://../README;md5=79cddd95f8b7539aced400f6aab996e9 \
- file://wpa_supplicant.c;beginline=1;endline=17;md5=009c87d612d92175fe8cd1e93137bf42"
-
-# Tag: ol_R5.00.18
-SRCREV = "b228361c306aea007672cda115b2701907d8d685"
-PR_append = "b+gitr${SRCPV}"
-
-SRC_URI += "file://0001-wpa_supplicant-dbus-AP-Add-support-for-WPS-Internal-.patch;patchdir=.. "
diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant_r5.sp4.01.bb b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant_r5.sp4.01.bb
deleted file mode 100644
index 2fc77a5..0000000
--- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant_r5.sp4.01.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-# This is a TI specific version of the wpa-supplicant recipe for use with the
-# wl12xx wlan and bluetooth module.
-
-require wpa-supplicant.inc
-
-LIC_FILES_CHKSUM = "file://../COPYING;md5=ab87f20cd7e8c0d0a6539b34d3791d0e \
- file://../README;md5=5cb758942d25f6f61fd4ac388fd446fa \
- file://wpa_supplicant.c;beginline=1;endline=17;md5=8835156c8ab8cad6356ec7f39ebe3aba"
-
-
-# Tag: ol_R5.SP4.01
-SRCREV = "7190ff7dbd43243290b626068ded0d61c5019050"
-PR_append = "b+gitr${SRCPV}"
diff --git a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils.inc b/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils.inc
deleted file mode 100644
index cdb3746..0000000
--- a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "The calibrator and other useful utilities for TI wireless solution based on wl12xx driver"
-LICENSE = "BSD"
-
-DEPENDS = "libnl"
-RDEPENDS_${PN} = "ti-compat-wireless-wl12xx wl12xx-firmware"
-
-PR ="r1"
-
-SRC_URI = "git://github.com/TI-OpenLink/ti-utils.git;protocol=git"
-
-S = "${WORKDIR}/git"
-
-export CROSS_COMPILE = "${TARGET_PREFIX}"
-CFLAGS += " -DCONFIG_LIBNL20"
-
-do_install() {
- install -d ${D}${bindir}
- install -d ${D}${datadir}/ti/wifi-utils/ini_files/127x
- install -d ${D}${datadir}/ti/wifi-utils/ini_files/128x
-
- install -m 0755 calibrator ${D}${bindir}/
- install -m 0755 ${S}/hw/ini_files/127x/* ${D}${datadir}/ti/wifi-utils/ini_files/127x
- install -m 0755 ${S}/hw/ini_files/128x/* ${D}${datadir}/ti/wifi-utils/ini_files/128x
-}
-
-FILES_${PN} += " \
- ${datadir}/ti/wifi-utils/ini_files/127x \
- ${datadir}/ti/wifi-utils/ini_files/128x \
-"
diff --git a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils_r5.00.18.bb b/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils_r5.00.18.bb
deleted file mode 100644
index 6d3560f..0000000
--- a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils_r5.00.18.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require ti-wifi-utils.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4725015cb0be7be389cf06deeae3683d"
-
-PR_append ="b+gitr${SRCPV}"
-
-# Tag: ol_R5.00.18
-SRCREV = "b42044175ca7262cd3e8f76d59dce46fe857ccb6"
diff --git a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils_r5.sp3.05.bb b/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils_r5.sp3.05.bb
deleted file mode 100644
index c04286d..0000000
--- a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils_r5.sp3.05.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ti-wifi-utils.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4725015cb0be7be389cf06deeae3683d"
-
-PR_append ="c+gitr${SRCPV}"
-
-# Tag: ol_R5.SP3.05
-SRCREV = "e6dcb896facd7b3c422fd2bb4d10765ee691ceb4"
-
-RDEPENDS_${PN}_am335x-evm_append = " wilink-calibrate"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/5] Remove all Wilink bluetooth references from packagegroups and other recipes.
2014-01-17 1:19 [PATCH 1/5] Remove Wilink 6 references from packagegroups and other recipes Franklin S. Cooper Jr
2014-01-17 1:19 ` [PATCH 2/5] Remove all Wilink 6 related recipes Franklin S. Cooper Jr
@ 2014-01-17 1:19 ` Franklin S. Cooper Jr
2014-01-17 1:19 ` [PATCH 4/5] Remove all Wilink bluetooth related recipes Franklin S. Cooper Jr
2014-01-17 1:19 ` [PATCH 5/5] Add Wilink 8 support for AM43x boards Franklin S. Cooper Jr
3 siblings, 0 replies; 5+ messages in thread
From: Franklin S. Cooper Jr @ 2014-01-17 1:19 UTC (permalink / raw)
To: meta-arago; +Cc: Franklin S. Cooper Jr
* Wilink going forward will not support bluetooth via bluez.
* Remove all references to these recipes from other packagegroups and other sdk
recipes.
---
.../conf/distro/arago-source-ipk.conf | 9 ---
.../conf/distro/include/arago-prefs.inc | 2 -
...ckagegroup-arago-tisdk-connectivity-sdk-host.bb | 7 +--
...agegroup-arago-tisdk-connectivity-sdk-target.bb | 11 +---
.../packagegroup-arago-tisdk-connectivity.bb | 24 +--------
.../packagegroup-arago-tisdk-matrix.bb | 4 +-
.../ti-tisdk-makefile/Makefile_wireless | 54 +------------------
.../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb | 2 +-
8 files changed, 10 insertions(+), 103 deletions(-)
diff --git a/meta-arago-distro/conf/distro/arago-source-ipk.conf b/meta-arago-distro/conf/distro/arago-source-ipk.conf
index 9b78258..bdee5d1 100644
--- a/meta-arago-distro/conf/distro/arago-source-ipk.conf
+++ b/meta-arago-distro/conf/distro/arago-source-ipk.conf
@@ -88,18 +88,9 @@ SRCIPK_INSTALL_DIR_pn-ti-pru-sw-examples = "example-applications/pru-${PV}"
CREATE_SRCIPK_pn-ti-ocf-crypto-module = "1"
SRCIPK_INSTALL_DIR_pn-ti-ocf-crypto-module = "board-support/extra-drivers/${PN}-${PV}"
-CREATE_SRCIPK_pn-bt-enable = "1"
-SRCIPK_INSTALL_DIR_pn-bt-enable = "board-support/extra-drivers/${PN}-${PV}"
-
-CREATE_SRCIPK_pn-bt-firmware = "1"
-SRCIPK_INSTALL_DIR_pn-bt-firmware = "board-support/extra-drivers/${PN}-${PV}"
-
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-ti-compat-bluetooth = "1"
-SRCIPK_INSTALL_DIR_pn-ti-compat-bluetooth = "board-support/extra-drivers/${PN}-${PV}"
-
CREATE_SRCIPK_pn-wl18xx-firmware = "1"
SRCIPK_INSTALL_DIR_pn-wl18xx-firmware = "board-support/extra-drivers/${PN}-${PV}"
diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc
index e1da2e9..8a2d7de 100644
--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
@@ -88,8 +88,6 @@ PREFERRED_VERSION_readline-nativesdk = "5.2"
PREFERRED_VERSION_libnl = "3.2.21"
PREFERRED_VERSION_crda = "1.1.3"
PREFERRED_VERSION_obex = "0.34"
-PREFERRED_VERSION_bluez4 = "4.101"
-PREFERRED_VERSION_bluez-hcidump = "2.2"
PREFERRED_VERSION_bash = "3.2.48"
PREFERRED_VERSION_gettext = "0.16.1"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-host.bb
index 50ca1bc..4ebfe15 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-host.bb
@@ -1,17 +1,12 @@
DESCRIPTION = "Task to install wlan and bluetooth sources into the SDK"
LICENSE = "MIT"
-PR = "r7"
+PR = "r8"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
-# Further breaks to resolve
-# ti-compat-bluetooth-src
-
FIRMWARE_AND_DRIVERS_SRC = "\
- bt-firmware-src \
- bt-enable-src \
wl18xx-firmware-src \
"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb
index b920770..28304c6 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb
@@ -1,21 +1,14 @@
-DESCRIPTION = "Task to install wlan and bluetooth headers and libraries into the SDK"
+DESCRIPTION = "Task to install wlan headers and libraries into the SDK"
LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
-# Bluetooth development packages
-BLUETOOTH_STACK = "\
- bluez4-dev \
- openobex-dev \
-"
-
CONNECTIVITY_RDEPENDS = ""
CONNECTIVITY_RDEPENDS_ti33x = "\
- ${BLUETOOTH_STACK} \
wpa-supplicant-wl18xx-dev \
"
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 fd71494..0cdc480 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
@@ -1,6 +1,6 @@
-DESCRIPTION = "Task to install wlan and bluetooth packages into the target FS"
+DESCRIPTION = "Task to install wlan packages into the target FS"
LICENSE = "MIT"
-PR = "r19"
+PR = "r20"
inherit packagegroup
@@ -13,14 +13,11 @@ WLAN_COMMON = "\
htop \
iw \
softap-udhcpd-config \
- bluez-tools \
obexd \
obex-client \
pulseaudio \
pulseaudio-server \
pulseaudio-module-loopback \
- pulseaudio-module-bluetooth-discover \
- pulseaudio-module-bluetooth-device \
eventdump \
wlconf \
wpa-supplicant-wl18xx \
@@ -28,31 +25,15 @@ WLAN_COMMON = "\
hostap-daemon-wl18xx \
ti-wifi-utils-wl18xx \
"
-# No bluetooth/bluetooth.h
# netperf has non-standard license, needs verifying
# netperf
-# Further breaks to resolve
-# ti-compat-bluetooth
-
FIRMWARE_AND_DRIVERS = "\
wl18xx-firmware \
"
-BLUETOOTH_STACK = "\
- bluez4 \
- bluez4-agent \
- libasound-module-bluez \
- bluez-hcidump \
- openobex \
- openobex-apps \
- obexftp \
- ussp-push \
-"
-
DEMO_APPS = "\
- bluetooth-gui \
wpa-gui-e \
"
@@ -60,7 +41,6 @@ CONNECTIVITY_RDEPENDS = ""
CONNECTIVITY_RDEPENDS_ti33x = "\
${WLAN_COMMON} \
- ${BLUETOOTH_STACK} \
${DEMO_APPS} \
${FIRMWARE_AND_DRIVERS} \
"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
index 311ad2e..b8b3217 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to include Matrix v2"
LICENSE = "MIT"
-PR = "r24"
+PR = "r25"
inherit packagegroup
@@ -65,7 +65,6 @@ MATRIX_APPS_append_ti33x = " \
matrix-gui-clocks \
\
matrix-gui-wifi-demos \
- matrix-gui-bluetooth-demos \
"
MATRIX_APPS_append_ti43x = " \
@@ -116,7 +115,6 @@ MATRIX_APPS_append_am37x-evm = " \
"
MATRIX_APPS_append_am180x-evm = " \
- matrix-gui-bluetooth-demos \
matrix-gui-pru-demos \
"
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_wireless b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_wireless
index 708c0ad..de99463 100755
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_wireless
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_wireless
@@ -1,55 +1,13 @@
# Wireless build targets
-wireless: compat-modules bt-firmware bt-enable
-wireless_install: compat-modules_install bt-firmware_install bt-enable_install
-wireless_clean: compat-modules_clean bt-firmware_clean bt-enable_clean
-
-bt-firmware:
- @echo ============================
- @echo Building bt-firmware
- @echo ============================
- @echo NOTHING TO DO. COMPILATION NOT REQUIRED
-
-bt-firmware_install:
- @echo ==============================
- @echo Installing bt-firmware
- @echo ==============================
- @cd board-support/extra-drivers; cd `find . -name "*bt-firmware*"`; make DEST_DIR=${DESTDIR} BASE_LIB_DIR="/lib" PLATFORM=${PLATFORM} install
-
-bt-firmware_clean:
- @echo ============================
- @echo Cleaning bt-firmware
- @echo ============================
- @echo NOTHING TO DO.
-
-bt-enable: linux
- @echo ===========================
- @echo Building bt-enable
- @echo ===========================
- @cd board-support/extra-drivers; cd `find . -name "*bt-enable*"`; \
- make DEST_DIR=${DESTDIR} PLATFORM=${PLATFORM}
-
-bt-enable_install:
- @echo ============================
- @echo Installing bt-enable
- @echo ============================
- @cd board-support/extra-drivers; cd `find . -name "*bt-enable*"`; \
- make DEST_DIR=${DESTDIR} PLATFORM=${PLATFORM} install
-
-bt-enable_clean:
- @echo ===========================
- @echo Cleaning bt-enable
- @echo ===========================
- @cd board-support/extra-drivers; cd `find . -name "*bt-enable*"`; \
- make DEST_DIR=${DESTDIR} PLATFORM=${PLATFORM} clean
+wireless: compat-modules
+wireless_install: compat-modules_install
+wireless_clean: compat-modules_clean
compat-modules: linux
@echo ================================
@echo Building compat-modules
@echo ================================
@cd board-support/extra-drivers; \
- cd `find . -maxdepth 1 -name "*compat-bluetooth*"`; \
- ./scripts/driver-select bt; make DEPMOD=echo DESTDIR=${DESTDIR} KLIB_BUILD=${LINUXKERNEL_INSTALL_DIR} KLIB=${DESTDIR} CROSS_COMPILE=${CROSS_COMPILE} ARCH=arm; \
- cd ..; \
cd `find . -maxdepth 1 -name "*compat-wireless*"`; \
./scripts/driver-select wl12xx; make DEPMOD=echo DESTDIR=${DESTDIR} KLIB_BUILD=${LINUXKERNEL_INSTALL_DIR} KLIB=${DESTDIR} CROSS_COMPILE=${CROSS_COMPILE} ARCH=arm
@@ -58,9 +16,6 @@ compat-modules_install:
@echo Installing compat-modules
@echo ==================================
@cd board-support/extra-drivers; \
- cd `find . -maxdepth 1 -name "*compat-bluetooth*"`; \
- make DEPMOD=echo DESTDIR=${DESTDIR} KLIB_BUILD=${LINUXKERNEL_INSTALL_DIR} KLIB=${DESTDIR} INSTALL_MOD_PATH=${DESTDIR} CROSS_COMPILE=${CROSS_COMPILE} ARCH=arm install-modules; \
- cd ..; \
cd `find . -maxdepth 1 -name "*compat-wireless*"`; \
make DEPMOD=echo DESTDIR=${DESTDIR} KLIB_BUILD=${LINUXKERNEL_INSTALL_DIR} KLIB=${DESTDIR} INSTALL_MOD_PATH=${DESTDIR} CROSS_COMPILE=${CROSS_COMPILE} ARCH=arm install-modules
@@ -69,8 +24,5 @@ compat-modules_clean:
@echo Cleaning compat-wireless
@echo ================================
@cd board-support/extra-drivers; \
- cd `find . -maxdepth 1 -name "*compat-bluetooth*"`; \
- make DEPMOD=echo DESTDIR=${DESTDIR} KLIB_BUILD=${LINUXKERNEL_INSTALL_DIR} KLIB=${DESTDIR} CROSS_COMPILE=${CROSS_COMPILE} ARCH=arm clean; \
- cd ..; \
cd `find . -maxdepth 1 -name "*compat-wireless*"`; \
make DEPMOD=echo DESTDIR=${DESTDIR} KLIB_BUILD=${LINUXKERNEL_INSTALL_DIR} KLIB=${DESTDIR} CROSS_COMPILE=${CROSS_COMPILE} ARCH=arm clean
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
index 913553a..ed23f98 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
@@ -33,7 +33,7 @@ SRC_URI = "\
file://Makefile_oprofile-example \
"
-PR = "r21"
+PR = "r22"
MAKEFILES_COMMON = "linux \
matrix-gui \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 4/5] Remove all Wilink bluetooth related recipes
2014-01-17 1:19 [PATCH 1/5] Remove Wilink 6 references from packagegroups and other recipes Franklin S. Cooper Jr
2014-01-17 1:19 ` [PATCH 2/5] Remove all Wilink 6 related recipes Franklin S. Cooper Jr
2014-01-17 1:19 ` [PATCH 3/5] Remove all Wilink bluetooth references from packagegroups and other recipes Franklin S. Cooper Jr
@ 2014-01-17 1:19 ` Franklin S. Cooper Jr
2014-01-17 1:19 ` [PATCH 5/5] Add Wilink 8 support for AM43x boards Franklin S. Cooper Jr
3 siblings, 0 replies; 5+ messages in thread
From: Franklin S. Cooper Jr @ 2014-01-17 1:19 UTC (permalink / raw)
To: meta-arago; +Cc: Franklin S. Cooper Jr
* Wilink will no longer support bluetooth via bluez.
* Therefore, delete all bluetooth related recipes.
---
...kefile-Update-makefile-to-work-well-in-OE.patch | 78 --------------------
.../recipes-bsp/bt-enable/bt-enable_1.0.bb | 32 --------
...001-Makefile-allow-building-within-the-OE.patch | 49 ------------
.../recipes-bsp/bt-firmware/bt-firmware_git.bb | 41 ----------
...tooth-2.6-removed-unused-BT-modules-from-.patch | 47 ------------
...at-bluetooth-fixing-kernel-panic-in-l2cap.patch | 54 --------------
...h-Fix-l2cap-conn-failures-for-ssp-devices.patch | 45 -----------
.../ti-compat-bluetooth/ti-compat-bluetooth.inc | 26 -------
.../ti-compat-bluetooth_r5.00.18.bb | 12 ---
.../ti-compat-bluetooth_r5.sp3.05.bb | 12 ---
.../bluetooth-gui/bluetooth-gui.bb | 56 --------------
.../bluetooth-gui/files/bluetooth-icon.png | Bin 12479 -> 0 bytes
.../bluetooth-gui/files/bt_demo.desktop | 9 --
.../bluetooth-gui/files/desc_bluetooth.html | 5 -
.../bluez-tools/bluez-tools_git.bb | 30 --------
.../bluez/bluez-hcidump_2.2.bb | 19 -----
.../bluez/bluez4/bluetooth.conf | 16 ----
.../recipes-connectivity/bluez/bluez4_4.98.bb | 35 ---------
18 files changed, 0 insertions(+), 566 deletions(-)
delete mode 100644 meta-arago-extras/recipes-bsp/bt-enable/bt-enable/0001-Makefile-Update-makefile-to-work-well-in-OE.patch
delete mode 100644 meta-arago-extras/recipes-bsp/bt-enable/bt-enable_1.0.bb
delete mode 100644 meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware/0001-Makefile-allow-building-within-the-OE.patch
delete mode 100644 meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware_git.bb
delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-bluetooth/files/0001-compat-bluetooth-2.6-removed-unused-BT-modules-from-.patch
delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-bluetooth/files/0001-compat-bluetooth-fixing-kernel-panic-in-l2cap.patch
delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-bluetooth/files/0002-Bluetooth-Fix-l2cap-conn-failures-for-ssp-devices.patch
delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-bluetooth/ti-compat-bluetooth.inc
delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-bluetooth/ti-compat-bluetooth_r5.00.18.bb
delete mode 100644 meta-arago-extras/recipes-bsp/ti-compat-bluetooth/ti-compat-bluetooth_r5.sp3.05.bb
delete mode 100644 meta-arago-extras/recipes-connectivity/bluetooth-gui/bluetooth-gui.bb
delete mode 100755 meta-arago-extras/recipes-connectivity/bluetooth-gui/files/bluetooth-icon.png
delete mode 100755 meta-arago-extras/recipes-connectivity/bluetooth-gui/files/bt_demo.desktop
delete mode 100644 meta-arago-extras/recipes-connectivity/bluetooth-gui/files/desc_bluetooth.html
delete mode 100644 meta-arago-extras/recipes-connectivity/bluez-tools/bluez-tools_git.bb
delete mode 100644 meta-arago-extras/recipes-connectivity/bluez/bluez-hcidump_2.2.bb
delete mode 100644 meta-arago-extras/recipes-connectivity/bluez/bluez4/bluetooth.conf
delete mode 100644 meta-arago-extras/recipes-connectivity/bluez/bluez4_4.98.bb
diff --git a/meta-arago-extras/recipes-bsp/bt-enable/bt-enable/0001-Makefile-Update-makefile-to-work-well-in-OE.patch b/meta-arago-extras/recipes-bsp/bt-enable/bt-enable/0001-Makefile-Update-makefile-to-work-well-in-OE.patch
deleted file mode 100644
index 7e6756c..0000000
--- a/meta-arago-extras/recipes-bsp/bt-enable/bt-enable/0001-Makefile-Update-makefile-to-work-well-in-OE.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From a400ac3d83023a66a356d056899d6b380cb30473 Mon Sep 17 00:00:00 2001
-From: Chase Maupin <Chase.Maupin@ti.com>
-Date: Wed, 7 Mar 2012 10:51:43 -0600
-Subject: [PATCH] Makefile: Update makefile to work with OE
-
-* Updated the makefile to with OE
-* Use the kernel install target for installing the module
-
-Upstream-Status: Pending
- * will be in next release
-
-Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
----
- Makefile | 45 ++++++++++++++++++++++++++++++++++++++++-----
- 1 files changed, 40 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ebbcd11..b17d33e 100755
---- a/Makefile
-+++ b/Makefile
-@@ -7,15 +7,50 @@ else
- EXTRA_CFLAGS += -O2
- endif
-
-+-include ../../../Rules.make
-+
-+# If KERNEL_DIR is not set then use the default in Rules.make
-+KERNEL_DIR ?= ${LINUXKERNEL_INSTALL_DIR}
-+DEST_DIR ?= ${DESTDIR}
-+
-+PLATFORM ?= "unknown"
-+MACHINE_NAME ?= "unknown"
-+
-+# Use the PLATFORM value from the Rules.make if it was sourced
-+ifeq ($(PLATFORM), am335x-evm)
-+ MACHINE_NAME := "am335x"
-+endif
-+ifeq ($(PLATFORM), am180x-evm)
-+ MACHINE_NAME := "am1808"
-+endif
-+ifeq ($(PLATFORM), da850-omapl138-evm)
-+ MACHINE_NAME := "am1808"
-+endif
-+ifeq ($(PLATFORM), am37x-evm)
-+ MACHINE_NAME := "omap3evm"
-+endif
-+
-+# If CROSS_COMPILE is not set by Rules.make then set a sane default
-+CROSS_COMPILE ?= arm-arago-linux-gnueabi-
-+export CROSS_COMPILE
-+
-+# set the INSTALL_MOD_DIR so that the executables won't be placed in extra
-+INSTALL_MOD_DIR = kernel/drivers/bt_enable
-+export INSTALL_MOD_DIR
-+
- obj-m := gpio_en.o
-
-+MAKE_ENV = ARCH=arm
-+
- PWD := $(shell pwd)
- all:
-- pwd
-- @echo EXTRA_CFLAGS = $(EXTRA_CFLAGS)
-- $(MAKE) CROSS_COMPILE=$(CROSS_COMPILE) ARCH=$(ARCH) EXTRA_CFLAGS="$(EXTRA_CFLAGS)" -C $(KERNEL_DIR) M=$(PWD) modules
-+ @cp -f gpio_en_${MACHINE_NAME}.c gpio_en.c
-+ $(MAKE) EXTRA_CFLAGS="$(EXTRA_CFLAGS)" -C $(KERNEL_DIR) $(MAKE_ENV) \
-+ M=$(PWD) modules
-+
- install:
-- install -d ${DEST_DIR}${BASE_LIB_DIR}/modules/${KRNL_VER}/kernel/drivers/bt_enable
-- install -m 0755 ./gpio_en.ko ${DEST_DIR}${BASE_LIB_DIR}/modules/${KRNL_VER}/kernel/drivers/bt_enable
-+ $(MAKE) EXTRA_CFLAGS="$(EXTRA_CFLAGS)" -C $(KERNEL_DIR) $(MAKE_ENV) \
-+ M=$(PWD) INSTALL_MOD_PATH="${DEST_DIR}" modules_install
-+
- clean:
- rm -rf *.o *~ core .depend .*.cmd *.ko *.mod.c .tmp_versions *.symvers
---
-1.7.0.4
diff --git a/meta-arago-extras/recipes-bsp/bt-enable/bt-enable_1.0.bb b/meta-arago-extras/recipes-bsp/bt-enable/bt-enable_1.0.bb
deleted file mode 100644
index ae51e3f..0000000
--- a/meta-arago-extras/recipes-bsp/bt-enable/bt-enable_1.0.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "BT GPIO Enable"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://gpio_en_am1808.c;beginline=1;endline=34;md5=fe94639d8f61c867d1bc4bf61473d3cd \
- file://gpio_en_am335x.c;beginline=1;endline=34;md5=fe94639d8f61c867d1bc4bf61473d3cd \
- file://gpio_en_omap3evm.c;beginline=1;endline=34;md5=fe94639d8f61c867d1bc4bf61473d3cd \
-"
-COMPATIBLE_MACHINE = "omap3|omapl138|ti33x"
-
-PR = "${MACHINE_KERNEL_PR}"
-PR_append = "b+gitr${SRCPV}"
-
-SRCREV = "97c4600ff7d39f1cc6079939248cd9ed15100db4"
-
-SRC_URI = "git://github.com/TI-ECS/bt_enable.git;protocol=git \
- file://0001-Makefile-Update-makefile-to-work-well-in-OE.patch \
-"
-
-S = "${WORKDIR}/git"
-
-inherit module
-
-INHIBIT_PACKAGE_STRIP = "1"
-
-PLATFORM_ti33x = "am335x-evm"
-PLATFORM_omap3 = "am37x-evm"
-PLATFORM_omapl138 = "am180x-evm"
-
-EXTRA_OEMAKE += "KERNEL_DIR=${STAGING_KERNEL_DIR} PLATFORM=${PLATFORM}"
-
-do_install () {
- oe_runmake 'DEST_DIR=${D}' install
-}
diff --git a/meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware/0001-Makefile-allow-building-within-the-OE.patch b/meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware/0001-Makefile-allow-building-within-the-OE.patch
deleted file mode 100644
index 49caa85..0000000
--- a/meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware/0001-Makefile-allow-building-within-the-OE.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 8f226ccc9d2cbd10d454e131376c35f502a45e3b Mon Sep 17 00:00:00 2001
-From: Chase Maupin <Chase.Maupin@ti.com>
-Date: Wed, 7 Mar 2012 14:11:42 -0600
-Subject: [PATCH] Makefile: allow building with OE
-
-* Use defaults and source values that allow building this
- component with OE.
-
-Upstread-Status: Pending
- * Will be accepted into next release
-
-Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
----
- Makefile | 21 +++++++++++++++++++++
- 1 files changed, 21 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 9035e40..bd94881 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,26 @@
- # Installs the the Bluetooth firmware files into the root file system
-
-+-include ../../../Rules.make
-+
-+# If KERNEL_DIR is not set then use the default in Rules.make
-+DEST_DIR ?= ${DESTDIR}
-+
-+PLATFORM ?= "unknown"
-+MACHINE_NAME ?= "unknown"
-+
-+ifeq ($(PLATFORM), am335x-evm)
-+ MACHINE_NAME := am335x
-+endif
-+ifeq ($(PLATFORM), am180x-evm)
-+ MACHINE_NAME := am1808
-+endif
-+ifeq ($(PLATFORM), da850-omapl138-evm)
-+ MACHINE_NAME := am1808
-+endif
-+ifeq ($(PLATFORM), am37x-evm)
-+ MACHINE_NAME := omap3evm
-+endif
-+
- install:
- install -d $(DEST_DIR)${BASE_LIB_DIR}/firmware
- cp -f ./${MACHINE_NAME}/* $(DEST_DIR)${BASE_LIB_DIR}/firmware
---
-1.7.0.4
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 2b320da..0000000
--- a/meta-arago-extras/recipes-bsp/bt-firmware/bt-firmware_git.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Firmware files for Bluetooth"
-LICENSE = "TI-TSPA"
-LIC_FILES_CHKSUM = "file://am335x/LICENCE;md5=ba590e1d103f891d0151609046aef9e8 \
- file://am1808/LICENCE;md5=ba590e1d103f891d0151609046aef9e8 \
- file://omap3evm/LICENCE;md5=ba590e1d103f891d0151609046aef9e8 \
-"
-
-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"
-
-PR = "r2+gitr${SRCPV}"
-
-COMPATIBLE_MACHINE = "omap3|omapl138|da850-omapl138-evm|ti33x"
-
-SRCREV = "adbc27c11d5c5c8c20a93a8beca647b4a6aaa03b"
-SRC_URI = "git://github.com/TI-ECS/bt-firmware.git;protocol=git \
- file://0001-Makefile-allow-building-within-the-OE.patch"
-
-PLATFORM = "unknown"
-PLATFORM_ti33x = "am335x-evm"
-PLATFORM_omap3 = "am37x-evm"
-PLATFORM_omapl138 = "am180x-evm"
-PLATFORM_da850-omapl138-evm = "am180x-evm"
-
-S = "${WORKDIR}/git"
-
-do_compile() {
- :
-}
-
-do_install() {
- install -d ${D}${base_libdir}/firmware
- oe_runmake 'DEST_DIR=${D}' 'BASE_LIB_DIR=${base_libdir}' 'PLATFORM=${PLATFORM}' install
-}
-
-FILES_${PN} += "${base_libdir}/firmware"
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/files/0001-compat-bluetooth-2.6-removed-unused-BT-modules-from-.patch b/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/files/0001-compat-bluetooth-2.6-removed-unused-BT-modules-from-.patch
deleted file mode 100644
index a383e4c..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/files/0001-compat-bluetooth-2.6-removed-unused-BT-modules-from-.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 267cb471c7b182786f58a2a74f3d8bc977cb4527 Mon Sep 17 00:00:00 2001
-From: Vita Preskovsky <vitap@ti.com>
-Date: Thu, 29 Dec 2011 16:09:36 +0200
-Subject: [PATCH] compat-bluetooth-2.6: removed unused BT modules from compilation
-
- * config.mk is changed to not compile unused BT modules
-
- Signed-off-by: Vita Preskovsky <vitap@ti.com>
----
- config.mk | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/config.mk b/config.mk
-index f09d16d..56ac6df 100644
---- a/config.mk
-+++ b/config.mk
-@@ -226,14 +226,14 @@ ifndef CONFIG_COMPAT_KERNEL_2_6_28
- CONFIG_COMPAT_BT_HIDP=m
- endif #CONFIG_COMPAT_KERNEL_2_6_28
-
--CONFIG_BT_HCIUART=M
-+CONFIG_BT_HCIUART=m
- CONFIG_BT_HCIUART_H4=y
- CONFIG_BT_HCIUART_BCSP=y
--CONFIG_BT_HCIUART_ATH3K=y
-+#CONFIG_BT_HCIUART_ATH3K=y
- CONFIG_BT_HCIUART_LL=y
-
- CONFIG_BT_HCIVHCI=m
--CONFIG_BT_MRVL=m
-+#CONFIG_BT_MRVL=m
-
- ifdef CONFIG_PCMCIA
- CONFIG_BT_HCIDTL1=m
-@@ -606,8 +606,8 @@ CONFIG_IWM=m
- # CONFIG_IWM_DEBUG=y
- # CONFIG_IWM_TRACING=y
-
--CONFIG_BT_HCIBTSDIO=m
--CONFIG_BT_MRVL_SDIO=m
-+#CONFIG_BT_HCIBTSDIO=m
-+#CONFIG_BT_MRVL_SDIO=m
-
- ifndef CONFIG_COMPAT_KERNEL_2_6_27
- CONFIG_ATH6KL=m
---
-1.7.0.4
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/files/0001-compat-bluetooth-fixing-kernel-panic-in-l2cap.patch b/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/files/0001-compat-bluetooth-fixing-kernel-panic-in-l2cap.patch
deleted file mode 100644
index db04b5c..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/files/0001-compat-bluetooth-fixing-kernel-panic-in-l2cap.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 95bb5df2c28a51790ab3d63b34e417e2fc9c6235 Mon Sep 17 00:00:00 2001
-From: Vita Preskovsky <vitap@ti.com>
-Date: Tue, 12 Jun 2012 17:56:02 +0300
-Subject: [PATCH] compat-bluetooth: fixing kernel panic in l2cap
-
- * fixing kernel panic in l2cap layer. The problem appears
- for first time in new version R5.00.18.
-
-Upstream-Status: Pending
-
-Signed-off-by: Vita Preskovsky <vitap@ti.com>
----
- include/net/bluetooth/l2cap.h | 1 +
- net/bluetooth/l2cap_core.c | 6 +++++-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
-index c0d168a..5651a70 100644
---- a/include/net/bluetooth/l2cap.h
-+++ b/include/net/bluetooth/l2cap.h
-@@ -494,6 +494,7 @@ struct l2cap_chan {
-
- struct list_head list;
- struct list_head global_l;
-+ bool global_b;
-
- void *data;
- struct l2cap_ops *ops;
-diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
-index ffa2f6b..847dabc 100644
---- a/net/bluetooth/l2cap_core.c
-+++ b/net/bluetooth/l2cap_core.c
-@@ -316,6 +316,7 @@ struct l2cap_chan *l2cap_chan_create(struct sock *sk)
-
- write_lock_bh(&chan_list_lock);
- list_add(&chan->global_l, &chan_list);
-+ chan->global_b = true;
- write_unlock_bh(&chan_list_lock);
-
- INIT_DELAYED_WORK(&chan->chan_timer, l2cap_chan_timeout);
-@@ -332,7 +333,10 @@ struct l2cap_chan *l2cap_chan_create(struct sock *sk)
- void l2cap_chan_destroy(struct l2cap_chan *chan)
- {
- write_lock_bh(&chan_list_lock);
-- list_del(&chan->global_l);
-+ if (chan->global_b) {
-+ list_del(&chan->global_l);
-+ chan->global_b = false;
-+ }
- write_unlock_bh(&chan_list_lock);
-
- chan_put(chan);
---
-1.7.0.4
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/files/0002-Bluetooth-Fix-l2cap-conn-failures-for-ssp-devices.patch b/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/files/0002-Bluetooth-Fix-l2cap-conn-failures-for-ssp-devices.patch
deleted file mode 100644
index bf7bf47..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/files/0002-Bluetooth-Fix-l2cap-conn-failures-for-ssp-devices.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 18daf1644e634bae951a6e3d4d19d89170209762 Mon Sep 17 00:00:00 2001
-From: Peter Hurley <peter@hurleysoftware.com>
-Date: Fri, 13 Jan 2012 15:11:30 +0100
-Subject: [PATCH] Bluetooth: Fix l2cap conn failures for ssp devices
-
-Commit 330605423c fixed l2cap conn establishment for non-ssp remote
-devices by not setting HCI_CONN_ENCRYPT_PEND every time conn security
-is tested (which was always returning failure on any subsequent
-security checks).
-
-However, this broke l2cap conn establishment for ssp remote devices
-when an ACL link was already established at SDP-level security. This
-fix ensures that encryption must be pending whenever authentication
-is also pending.
-
-Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
-Tested-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
-Acked-by: Marcel Holtmann <marcel@holtmann.org>
-Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
-
-Upstream-Status: Backported
-From 18daf1644e634bae951a6e3d4d19d89170209762 in Linux kernel git
-
-Signed-off-by: Moosa Baransi <moosab@ti.com>
----
- net/bluetooth/hci_conn.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
-index 3db4324..07bc69e 100644
---- a/net/bluetooth/hci_conn.c
-+++ b/net/bluetooth/hci_conn.c
-@@ -635,6 +635,10 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
-
- if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->pend)) {
- struct hci_cp_auth_requested cp;
-+
-+ /* encrypt must be pending if auth is also pending */
-+ set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend);
-+
- cp.handle = cpu_to_le16(conn->handle);
- hci_send_cmd(conn->hdev, HCI_OP_AUTH_REQUESTED,
- sizeof(cp), &cp);
---
-1.7.4.1
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/ti-compat-bluetooth.inc b/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/ti-compat-bluetooth.inc
deleted file mode 100644
index 9003630..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/ti-compat-bluetooth.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "TI compat-bluetooth drivers"
-HOMEPAGE = "https://gforge.ti.com/gf/project/ecs_nlcp/"
-SECTION = "kernel/modules"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
-inherit module
-
-RDEPENDS_${PN} = "ti-compat-wireless-wl12xx"
-
-PR = "${MACHINE_KERNEL_PR}b"
-
-S = "${WORKDIR}/compat-bluetooth/"
-
-EXTRA_OEMAKE = "KLIB_BUILD=${STAGING_KERNEL_DIR} KLIB=${D}"
-
-do_configure() {
- cd ${S}
- ./scripts/driver-select bt
-}
-
-do_install() {
- oe_runmake DEPMOD=echo DESTDIR="${D}" INSTALL_MOD_PATH="${D}" LDFLAGS="" install-modules
- find ${D} -name compat.ko | xargs rm
-}
-
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/ti-compat-bluetooth_r5.00.18.bb b/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/ti-compat-bluetooth_r5.00.18.bb
deleted file mode 100644
index fa789cc..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/ti-compat-bluetooth_r5.00.18.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ti-compat-bluetooth.inc
-
-PR_append = "-r0"
-
-SRC_URI = "https://gforge.ti.com/gf/download/frsrelease/865/5622/compat-bluetooth-wl12xx-2012-05-22-r5-18.tgz \
- file://0001-compat-bluetooth-2.6-removed-unused-BT-modules-from-.patch \
- file://0002-Bluetooth-Fix-l2cap-conn-failures-for-ssp-devices.patch \
- file://0001-compat-bluetooth-fixing-kernel-panic-in-l2cap.patch \
-"
-
-SRC_URI[md5sum] = "85118756a605ebd8f4fbff19995368a6"
-SRC_URI[sha256sum] = "d250a6447de54f0776a12ca604bf2a2a48b022108b699de5008f48462e535393"
diff --git a/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/ti-compat-bluetooth_r5.sp3.05.bb b/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/ti-compat-bluetooth_r5.sp3.05.bb
deleted file mode 100644
index f49bcb0..0000000
--- a/meta-arago-extras/recipes-bsp/ti-compat-bluetooth/ti-compat-bluetooth_r5.sp3.05.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ti-compat-bluetooth.inc
-
-PR_append = "-r0"
-
-SRC_URI = "https://gforge.ti.com/gf/download/frsrelease/802/5435/ti-compat-bluetooth-2012-02-20.tar.gz \
- file://0001-compat-bluetooth-2.6-removed-unused-BT-modules-from-.patch \
- file://0002-Bluetooth-Fix-l2cap-conn-failures-for-ssp-devices.patch \
- file://0001-compat-bluetooth-fixing-kernel-panic-in-l2cap.patch \
-"
-
-SRC_URI[md5sum] = "7c231b35a2297391b5192f86ff4f10dd"
-SRC_URI[sha256sum] = "d8882da8bb37821bfd0b9334b859f64d0ce82ae5262360367a3f3fdf31c7f350"
diff --git a/meta-arago-extras/recipes-connectivity/bluetooth-gui/bluetooth-gui.bb b/meta-arago-extras/recipes-connectivity/bluetooth-gui/bluetooth-gui.bb
deleted file mode 100644
index 9be5ae9..0000000
--- a/meta-arago-extras/recipes-connectivity/bluetooth-gui/bluetooth-gui.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-DESCRIPTION = "Bluetooth GUI Application"
-SECTION = "network"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://src/main.cpp;beginline=1;endline=37;md5=83d75e9470fc1ba29e6f494fdef321be"
-COMPATIBLE_MACHINE = "(omap3evm|am37x-evm|am335x-evm|am180x-evm|am181x-evm)"
-
-BRANCH = "master"
-SRCREV = "046643eac13b4d6b6fd7525539ef666509df264e"
-
-PR = "r13"
-
-SRC_URI = "git://www.github.com/TI-ECS/BT_Demo.git;protocol=git;branch=${BRANCH} \
- file://bluetooth-icon.png \
- file://desc_bluetooth.html \
- file://bt_demo.desktop"
-
-require recipes-core/matrix/matrix-gui-paths.inc
-
-S = "${WORKDIR}/git"
-
-inherit qt4e
-
-PLATFORM_am37x-evm = "omap3evm"
-PLATFORM_omapl138 = "am1808"
-PLATFORM_am335x-evm = "am335x"
-PLATFORM ?= "UNKNOWN"
-
-do_install () {
- install -d ${D}${bindir}
- install -m 755 BT_Demo ${D}/${bindir}/bluetooth-gui
- install -m 755 ${S}/scripts/BT_Init_${PLATFORM}.sh ${D}${bindir}/BT_Init.sh
- install -m 755 ${S}/scripts/BT_Exit.sh ${D}${bindir}
- install -d 2755 ${D}${MATRIX_APP_DIR}/bt_demo
- install -m 644 ${WORKDIR}/bt_demo.desktop ${D}${MATRIX_APP_DIR}/bt_demo
- install -m 644 ${WORKDIR}/desc_bluetooth.html ${D}${MATRIX_APP_DIR}/bt_demo
- install -m 644 ${WORKDIR}/bluetooth-icon.png ${D}${MATRIX_APP_DIR}/bt_demo
-}
-
-PACKAGES += "matrix-gui-bluetooth-demos"
-
-FILES_${PN} +=" \
- ${bindir}/bluetooth-gui \
- ${bindir}/BT_Init.sh \
- ${bindir}/BT_Exit.sh \
- "
-
-RDEPENDS_${PN} += "pulseaudio"
-
-FILES_matrix-gui-bluetooth-demos += " \
- ${MATRIX_APP_DIR}/bt_demo/* \
- "
-
-RDEPENDS_matrix-gui-bluetooth-demos += "matrix-gui-apps-images matrix-gui-submenus-wifi ${PN}"
-
-SRC_URI[md5sum] = "357da8591816ff05e81f31379bde9a01"
-SRC_URI[sha256sum] = "aad229f585b21bf2eb4d3dee4b123271683b357bf0625b6da1ebced881595e6d"
diff --git a/meta-arago-extras/recipes-connectivity/bluetooth-gui/files/bluetooth-icon.png b/meta-arago-extras/recipes-connectivity/bluetooth-gui/files/bluetooth-icon.png
deleted file mode 100755
index 3411afa0aa0a205731f22ab4033825c7f18a69fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 12479
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
JPDHLkV1hvelhyzL
diff --git a/meta-arago-extras/recipes-connectivity/bluetooth-gui/files/bt_demo.desktop b/meta-arago-extras/recipes-connectivity/bluetooth-gui/files/bt_demo.desktop
deleted file mode 100755
index f462500..0000000
--- a/meta-arago-extras/recipes-connectivity/bluetooth-gui/files/bt_demo.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Name=Bluetooth
-GenericName=Bluetooth
-Icon=/usr/share/matrix-gui-2.0/apps/bt_demo/bluetooth-icon.png
-Type=Application
-Exec=bluetooth-gui --blacklist-alsa-cards="L138 EVM,omap3evm,AM335X EVM"
-X-ProgramType=gui
-X-MATRIX-Description=/usr/share/matrix-gui-2.0/apps/bt_demo/desc_bluetooth.html
diff --git a/meta-arago-extras/recipes-connectivity/bluetooth-gui/files/desc_bluetooth.html b/meta-arago-extras/recipes-connectivity/bluetooth-gui/files/desc_bluetooth.html
deleted file mode 100644
index 9c70972..0000000
--- a/meta-arago-extras/recipes-connectivity/bluetooth-gui/files/desc_bluetooth.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<h1> Bluetooth GUI </h1>
-
-<h2>Warning: The WiFi/Bluetooth daughter card is required in order for bluetooth to operate correctly.
-Please ensure it is attached before continuing.</h2>
-
diff --git a/meta-arago-extras/recipes-connectivity/bluez-tools/bluez-tools_git.bb b/meta-arago-extras/recipes-connectivity/bluez-tools/bluez-tools_git.bb
deleted file mode 100644
index 5ef5046..0000000
--- a/meta-arago-extras/recipes-connectivity/bluez-tools/bluez-tools_git.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Bluez Tools"
-HOMEPAGE = "http://code.google.com/p/bluez-tools/"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
-
-RDEPENDS_${PN} = "bluez4 obexd"
-DEPENDS = "glib-2.0 dbus-glib"
-
-PR = "r2+gitr${SRCPV}"
-
-SRCREV = "171181b6ef6c94aefc828dc7fd8de136b9f97532"
-
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://gitorious.org/bluez-tools/bluez-tools.git;protocol=git"
-
-inherit autotools
-
-do_install() {
- install -d ${D}${bindir}
- install -m 755 ${S}/src/bt-adapter ${D}${bindir}
- install -m 755 ${S}/src/bt-agent ${D}${bindir}
- install -m 755 ${S}/src/bt-audio ${D}${bindir}
- install -m 755 ${S}/src/bt-device ${D}${bindir}
- install -m 755 ${S}/src/bt-input ${D}${bindir}
- install -m 755 ${S}/src/bt-monitor ${D}${bindir}
- install -m 755 ${S}/src/bt-network ${D}${bindir}
- install -m 755 ${S}/src/bt-obex ${D}${bindir}
- install -m 755 ${S}/src/bt-serial ${D}${bindir}
-}
diff --git a/meta-arago-extras/recipes-connectivity/bluez/bluez-hcidump_2.2.bb b/meta-arago-extras/recipes-connectivity/bluez/bluez-hcidump_2.2.bb
deleted file mode 100644
index 4c005ee..0000000
--- a/meta-arago-extras/recipes-connectivity/bluez/bluez-hcidump_2.2.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "bluez4"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
- file://src/hcidump.c;beginline=1;endline=23;md5=3bee3a162dff43a5be7470710b99fbcf"
-PR = "r1"
-
-SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-${PV}.tar.gz"
-S = "${WORKDIR}/bluez-hcidump-${PV}"
-
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
-
-inherit autotools
-
-SRC_URI[md5sum] = "3c298a8be67099fe227f3e4d9de539d5"
-SRC_URI[sha256sum] = "073066d3ec1f7d1c52bb0fe27cde84ea273e1ab3097b27fa1fd45a5992e1a441"
-
diff --git a/meta-arago-extras/recipes-connectivity/bluez/bluez4/bluetooth.conf b/meta-arago-extras/recipes-connectivity/bluez/bluez4/bluetooth.conf
deleted file mode 100644
index ca5e9e4..0000000
--- a/meta-arago-extras/recipes-connectivity/bluez/bluez4/bluetooth.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- This configuration file specifies the required security policies
- for Bluetooth core daemon to work. -->
-
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
- <!-- ../system.conf have denied everything, so we just punch some holes -->
-
- <policy context="default">
- <allow own="org.bluez"/>
- <allow send_destination="org.bluez"/>
- <allow send_interface="org.bluez.Agent"/>
- </policy>
-
-</busconfig>
diff --git a/meta-arago-extras/recipes-connectivity/bluez/bluez4_4.98.bb b/meta-arago-extras/recipes-connectivity/bluez/bluez4_4.98.bb
deleted file mode 100644
index 2cb8618..0000000
--- a/meta-arago-extras/recipes-connectivity/bluez/bluez4_4.98.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-require recipes-connectivity/bluez/bluez4.inc
-
-PR = "r0"
-
-SRC_URI += "file://bluetooth.conf \
-"
-
-SRC_URI[md5sum] = "362864b716950baa04797de735fc237b"
-SRC_URI[sha256sum] = "9a5b655bada7c7a1921cb3bac83b8a32bbe49893e4c7a1377cdc1b0d35f7d233"
-
-do_install_append() {
- install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
- install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
- install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
- # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
- install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
-}
-
-RDEPENDS_${PN}-dev = "bluez-hcidump"
-
-ALLOW_EMPTY_libasound-module-bluez = "1"
-PACKAGES =+ "libasound-module-bluez"
-
-FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
-FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1"
-FILES_${PN}-dev += "\
- ${libdir}/bluetooth/plugins/*.la \
- ${libdir}/alsa-lib/*.la \
-"
-
-FILES_${PN}-dbg += "\
- ${libdir}/bluetooth/plugins/.debug \
- ${libdir}/*/.debug \
- ${base_libdir}/udev/.debug \
-"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 5/5] Add Wilink 8 support for AM43x boards
2014-01-17 1:19 [PATCH 1/5] Remove Wilink 6 references from packagegroups and other recipes Franklin S. Cooper Jr
` (2 preceding siblings ...)
2014-01-17 1:19 ` [PATCH 4/5] Remove all Wilink bluetooth related recipes Franklin S. Cooper Jr
@ 2014-01-17 1:19 ` Franklin S. Cooper Jr
3 siblings, 0 replies; 5+ messages in thread
From: Franklin S. Cooper Jr @ 2014-01-17 1:19 UTC (permalink / raw)
To: meta-arago; +Cc: Franklin S. Cooper Jr
---
.../conf/distro/include/arago-prefs.inc | 1 +
...ckagegroup-arago-tisdk-connectivity-sdk-host.bb | 4 +++-
...agegroup-arago-tisdk-connectivity-sdk-target.bb | 6 +++++-
.../packagegroup-arago-tisdk-connectivity.bb | 8 +++++++-
.../packagegroup-arago-tisdk-matrix.bb | 4 +++-
.../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb | 3 ++-
6 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc
index 8a2d7de..d5176fd 100644
--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
@@ -93,3 +93,4 @@ PREFERRED_VERSION_gettext = "0.16.1"
PREFERRED_PROVIDER_wpa-supplicant = "wpa-supplicant"
PREFERRED_PROVIDER_wpa-supplicant_ti33x = "wpa-supplicant-wl18xx"
+PREFERRED_PROVIDER_wpa-supplicant_ti43x = "wpa-supplicant-wl18xx"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-host.bb
index 4ebfe15..e367c28 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-host.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to install wlan and bluetooth sources into the SDK"
LICENSE = "MIT"
-PR = "r8"
+PR = "r9"
inherit packagegroup
@@ -14,6 +14,8 @@ CONNECTIVITY_RDEPENDS = ""
CONNECTIVITY_RDEPENDS_ti33x = "${FIRMWARE_AND_DRIVERS_SRC}"
+CONNECTIVITY_RDEPENDS_ti43x = "${FIRMWARE_AND_DRIVERS_SRC}"
+
RDEPENDS_${PN} = "\
${CONNECTIVITY_RDEPENDS} \
"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb
index 28304c6..a7bcd56 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to install wlan headers and libraries into the SDK"
LICENSE = "MIT"
-PR = "r5"
+PR = "r6"
inherit packagegroup
@@ -12,6 +12,10 @@ CONNECTIVITY_RDEPENDS_ti33x = "\
wpa-supplicant-wl18xx-dev \
"
+CONNECTIVITY_RDEPENDS_ti43x = "\
+ wpa-supplicant-wl18xx-dev \
+"
+
RDEPENDS_${PN} = "\
${CONNECTIVITY_RDEPENDS} \
"
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 0cdc480..622e9e4 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
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to install wlan packages into the target FS"
LICENSE = "MIT"
-PR = "r20"
+PR = "r21"
inherit packagegroup
@@ -45,6 +45,12 @@ CONNECTIVITY_RDEPENDS_ti33x = "\
${FIRMWARE_AND_DRIVERS} \
"
+CONNECTIVITY_RDEPENDS_ti43x = "\
+ ${WLAN_COMMON} \
+ ${DEMO_APPS} \
+ ${FIRMWARE_AND_DRIVERS} \
+"
+
RDEPENDS_${PN} = "\
${CONNECTIVITY_RDEPENDS} \
"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
index b8b3217..220d77f 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to include Matrix v2"
LICENSE = "MIT"
-PR = "r25"
+PR = "r26"
inherit packagegroup
@@ -78,6 +78,8 @@ MATRIX_APPS_append_ti43x = " \
matrix-gui-generic-pm \
matrix-gui-pm-demos-suspend \
matrix-gui-clocks \
+ \
+ matrix-gui-wifi-demos \
"
MATRIX_APPS_append_omap-a15 = " \
diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
index ed23f98..34a53b6 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
@@ -33,7 +33,7 @@ SRC_URI = "\
file://Makefile_oprofile-example \
"
-PR = "r22"
+PR = "r23"
MAKEFILES_COMMON = "linux \
matrix-gui \
@@ -70,6 +70,7 @@ MAKEFILES_append_ti43x = " u-boot-spl \
${QUICK_PLAYGROUND} \
ti-crypto-examples \
linux-dtbs \
+ wireless \
"
MAKEFILES_append_omap-a15 = " u-boot-spl \
${QUICK_PLAYGROUND} \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-01-16 23:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-17 1:19 [PATCH 1/5] Remove Wilink 6 references from packagegroups and other recipes Franklin S. Cooper Jr
2014-01-17 1:19 ` [PATCH 2/5] Remove all Wilink 6 related recipes Franklin S. Cooper Jr
2014-01-17 1:19 ` [PATCH 3/5] Remove all Wilink bluetooth references from packagegroups and other recipes Franklin S. Cooper Jr
2014-01-17 1:19 ` [PATCH 4/5] Remove all Wilink bluetooth related recipes Franklin S. Cooper Jr
2014-01-17 1:19 ` [PATCH 5/5] Add Wilink 8 support for AM43x boards Franklin S. Cooper Jr
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.