From: Bruce Ashfield Date: Tue, 27 Mar 2018 15:03:16 +0000 (-0400) Subject: linux-yocto/meta: improve wifi driver granularity X-Git-Tag: yocto-4.0~13808 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c24d6863768a64b2c1632d5202790689a1164694;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git linux-yocto/meta: improve wifi driver granularity Integrating the following commit for the 4.12+ kernels: Author: Nathan Rossi Date: Wed Mar 21 00:10:02 2018 +1000 features/wifi: Add WiFi driver fragments for various vendors/interfaces This change adds WiFi driver configuration fragments. The fragments are split into vendor and interface files to allow for easy selection of drivers for specific interface types (USB, PCI, SDIO) which is useful for BSPs with specific interfaces. The specific vendor/interface config fragments can be included by specific BSPs in its .scc files. However .scc files (wifi-*.scc) are provided to allow enabling interface specific or all interfaces drivers via KERNEL_FEATURES or inclusion via other .scc files. And wifi-common.scc is provided to enable the base config options required for all WiFi drivers, which is done to ensure correct configuration for default no config setups (e.g. linux-yocto-tiny). This patch only enables a limited set of drivers, which is based on what the common-pc-wifi.cfg fragment sets as well as some additional drivers, that primarily appear in USB WiFi devices. Signed-off-by: Nathan Rossi Signed-off-by: Bruce Ashfield This gives us a much better granularity of drivers and a good baseline for future improvements. The 4.12 fragments are also slightly re-organized on top of this commit to avoid patch failures when including the new frags. Signed-off-by: Nathan Rossi Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb index 7b6d67c623f..a59ab20feb0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "e631b6433928b4b7f44b7ae2e97fe0a174aa0b44" -SRCREV_meta ?= "2feb169ba66721f3794bacd97c8360ad594ce133" +SRCREV_meta ?= "0ca42aa3dc27efbf56993644bb37408f5c798eb0" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb index dc083272347..07ad6bad326 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "26443228033c81f99bf75e5b75eec662f39243b1" -SRCREV_meta ?= "95cda8806311f4d922919e2eb6581bcb6d08e7f2" +SRCREV_meta ?= "53a4d48a80a127a3a14a0d3d81f52989fbbf9645" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb index 457d5f0929e..9da16b5afcf 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "12f3957167b0001adc7c2c8b3d45127aafc37e6b" -SRCREV_meta ?= "e09bcd01af6a000647f7d6ec9b864c6ff5ffac89" +SRCREV_meta ?= "fd79a455524e39c31ea2b8ed7674834d2e4933f4" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb index d31c6ff3e1d..b0f7d77998f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb @@ -10,7 +10,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "1a600c736163e7350ee4da9172f5321d06a72889" -SRCREV_meta ?= "2feb169ba66721f3794bacd97c8360ad594ce133" +SRCREV_meta ?= "0ca42aa3dc27efbf56993644bb37408f5c798eb0" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb index d3ac63898f7..a9aa571540b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb @@ -10,7 +10,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "ff658b2ac6a54d40fcf17a9d5d8d854b80067d49" -SRCREV_meta ?= "95cda8806311f4d922919e2eb6581bcb6d08e7f2" +SRCREV_meta ?= "53a4d48a80a127a3a14a0d3d81f52989fbbf9645" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb index 76f6cab95e9..23b5f538784 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0" SRCREV_machine_qemux86-64 ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0" SRCREV_machine_qemumips64 ?= "f9a3a72209bde080e4ecb4fbe7a0f99954643131" SRCREV_machine ?= "12f3957167b0001adc7c2c8b3d45127aafc37e6b" -SRCREV_meta ?= "e09bcd01af6a000647f7d6ec9b864c6ff5ffac89" +SRCREV_meta ?= "fd79a455524e39c31ea2b8ed7674834d2e4933f4" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.12.bb b/meta/recipes-kernel/linux/linux-yocto_4.12.bb index 6c82505b479..c112ae4d212 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.12.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "1a600c736163e7350ee4da9172f5321d06a72889" SRCREV_machine_qemux86-64 ?= "1a600c736163e7350ee4da9172f5321d06a72889" SRCREV_machine_qemumips64 ?= "68bcd22421aa288aff3dc9cf3035539788b04353" SRCREV_machine ?= "1a600c736163e7350ee4da9172f5321d06a72889" -SRCREV_meta ?= "2feb169ba66721f3794bacd97c8360ad594ce133" +SRCREV_meta ?= "0ca42aa3dc27efbf56993644bb37408f5c798eb0" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.14.bb b/meta/recipes-kernel/linux/linux-yocto_4.14.bb index 13e465198c0..2904ef65f8b 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.14.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "6ba0d6a225af558654be7619655b0c32ca866bc7" SRCREV_machine_qemux86-64 ?= "6ba0d6a225af558654be7619655b0c32ca866bc7" SRCREV_machine_qemumips64 ?= "d8c7e535a8dcc7b30213c628e4c4c98e56daad6b" SRCREV_machine ?= "6ba0d6a225af558654be7619655b0c32ca866bc7" -SRCREV_meta ?= "95cda8806311f4d922919e2eb6581bcb6d08e7f2" +SRCREV_meta ?= "53a4d48a80a127a3a14a0d3d81f52989fbbf9645" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.15.bb b/meta/recipes-kernel/linux/linux-yocto_4.15.bb index 056fd30e6ab..023577d946a 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.15.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "12f3957167b0001adc7c2c8b3d45127aafc37e6b" SRCREV_machine_qemux86-64 ?= "12f3957167b0001adc7c2c8b3d45127aafc37e6b" SRCREV_machine_qemumips64 ?= "77ae4b3b45eab133a5daf1e90828e5dfe62062e1" SRCREV_machine ?= "12f3957167b0001adc7c2c8b3d45127aafc37e6b" -SRCREV_meta ?= "e09bcd01af6a000647f7d6ec9b864c6ff5ffac89" +SRCREV_meta ?= "fd79a455524e39c31ea2b8ed7674834d2e4933f4" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}"