From 000ad171847cf5dfbb7f464b193dc40ec1af745b Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Mon, 9 Nov 2015 17:35:37 +0100 Subject: [PATCH] meta-digi: remove machine specific WPA_DRIVER Now that the MX5 platforms have been removed the only value for WPA_DRIVER is 'nl80211' (used by Atheros wireless driver), so there is no need to have a platform specific value. Just initialize the value in the init-ifupdown recipe with a weak assignment so it can be override from the project's local.conf. https://jira.digi.com/browse/DEL-1890 https://jira.digi.com/browse/DEL-1969 Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/ccardimx28.inc | 3 --- meta-digi-arm/conf/machine/include/ccimx6.inc | 3 --- .../recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc index b5daf3321..a153bf32e 100644 --- a/meta-digi-arm/conf/machine/include/ccardimx28.inc +++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc @@ -13,9 +13,6 @@ UBOOT_ENTRYPOINT = "0x40008000" UBOOT_SUFFIX = "sb" UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}" -# wpa_supplicant driver to use in '/etc/network/interfaces' -WPA_DRIVER = "nl80211" - # Wireless external module WIRELESS_MODULE ?= "" WIRELESS_MODULE_append = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-atheros', '', d)}" diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index 68771793e..b5a22f3aa 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6.inc @@ -13,9 +13,6 @@ UBOOT_ENTRYPOINT = "0x10800000" UBOOT_SUFFIX = "imx" UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}" -# wpa_supplicant driver to use in '/etc/network/interfaces' -WPA_DRIVER = "nl80211" - # Wireless external module WIRELESS_MODULE ?= "" diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend index 15b6aff57..ea800c967 100644 --- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend @@ -13,7 +13,7 @@ SRC_URI_append = " \ file://resolv \ " -WPA_DRIVER ?= "wext" +WPA_DRIVER ?= "nl80211" do_install_append() { # Install DNS servers handler