diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-03-27 11:03:16 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-30 00:31:17 +0100 |
commit | af167d4948c6aa33abb6fb92d067625fea29e1bd (patch) | |
tree | d92502d326ab0fe6fc0f337c9c3db5011d8b9caa /meta/recipes-kernel | |
parent | 2fca0f53ab347ca4de9341fc632676f5602332be (diff) | |
download | poky-af167d4948c6aa33abb6fb92d067625fea29e1bd.tar.gz |
linux-yocto/meta: improve wifi driver granularity
Integrating the following commit for the 4.12+ kernels:
Author: Nathan Rossi <nathan@nathanrossi.com>
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 <nathan@nathanrossi.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
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.
(From OE-Core rev: c24d6863768a64b2c1632d5202790689a1164694)
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
9 files changed, 9 insertions, 9 deletions
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 7b6d67c623..a59ab20feb 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 () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "e631b6433928b4b7f44b7ae2e97fe0a174aa0b44" | 14 | SRCREV_machine ?= "e631b6433928b4b7f44b7ae2e97fe0a174aa0b44" |
15 | SRCREV_meta ?= "2feb169ba66721f3794bacd97c8360ad594ce133" | 15 | SRCREV_meta ?= "0ca42aa3dc27efbf56993644bb37408f5c798eb0" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" | 18 | 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 dc08327234..07ad6bad32 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 () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "26443228033c81f99bf75e5b75eec662f39243b1" | 14 | SRCREV_machine ?= "26443228033c81f99bf75e5b75eec662f39243b1" |
15 | SRCREV_meta ?= "95cda8806311f4d922919e2eb6581bcb6d08e7f2" | 15 | SRCREV_meta ?= "53a4d48a80a127a3a14a0d3d81f52989fbbf9645" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" | 18 | 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 457d5f0929..9da16b5afc 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 () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "12f3957167b0001adc7c2c8b3d45127aafc37e6b" | 14 | SRCREV_machine ?= "12f3957167b0001adc7c2c8b3d45127aafc37e6b" |
15 | SRCREV_meta ?= "e09bcd01af6a000647f7d6ec9b864c6ff5ffac89" | 15 | SRCREV_meta ?= "fd79a455524e39c31ea2b8ed7674834d2e4933f4" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" | 18 | 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 d31c6ff3e1..b0f7d77998 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" | |||
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "1a600c736163e7350ee4da9172f5321d06a72889" | 12 | SRCREV_machine ?= "1a600c736163e7350ee4da9172f5321d06a72889" |
13 | SRCREV_meta ?= "2feb169ba66721f3794bacd97c8360ad594ce133" | 13 | SRCREV_meta ?= "0ca42aa3dc27efbf56993644bb37408f5c798eb0" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
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 d3ac63898f..a9aa571540 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" | |||
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "ff658b2ac6a54d40fcf17a9d5d8d854b80067d49" | 12 | SRCREV_machine ?= "ff658b2ac6a54d40fcf17a9d5d8d854b80067d49" |
13 | SRCREV_meta ?= "95cda8806311f4d922919e2eb6581bcb6d08e7f2" | 13 | SRCREV_meta ?= "53a4d48a80a127a3a14a0d3d81f52989fbbf9645" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
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 76f6cab95e..23b5f53878 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" | |||
19 | SRCREV_machine_qemux86-64 ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0" | 19 | SRCREV_machine_qemux86-64 ?= "9c2e6c0fc71526c45fc7ddf3ec91e2e2f27e3da0" |
20 | SRCREV_machine_qemumips64 ?= "f9a3a72209bde080e4ecb4fbe7a0f99954643131" | 20 | SRCREV_machine_qemumips64 ?= "f9a3a72209bde080e4ecb4fbe7a0f99954643131" |
21 | SRCREV_machine ?= "12f3957167b0001adc7c2c8b3d45127aafc37e6b" | 21 | SRCREV_machine ?= "12f3957167b0001adc7c2c8b3d45127aafc37e6b" |
22 | SRCREV_meta ?= "e09bcd01af6a000647f7d6ec9b864c6ff5ffac89" | 22 | SRCREV_meta ?= "fd79a455524e39c31ea2b8ed7674834d2e4933f4" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" | 25 | 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 6c82505b47..c112ae4d21 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" | |||
19 | SRCREV_machine_qemux86-64 ?= "1a600c736163e7350ee4da9172f5321d06a72889" | 19 | SRCREV_machine_qemux86-64 ?= "1a600c736163e7350ee4da9172f5321d06a72889" |
20 | SRCREV_machine_qemumips64 ?= "68bcd22421aa288aff3dc9cf3035539788b04353" | 20 | SRCREV_machine_qemumips64 ?= "68bcd22421aa288aff3dc9cf3035539788b04353" |
21 | SRCREV_machine ?= "1a600c736163e7350ee4da9172f5321d06a72889" | 21 | SRCREV_machine ?= "1a600c736163e7350ee4da9172f5321d06a72889" |
22 | SRCREV_meta ?= "2feb169ba66721f3794bacd97c8360ad594ce133" | 22 | SRCREV_meta ?= "0ca42aa3dc27efbf56993644bb37408f5c798eb0" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" | 25 | 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 13e465198c..2904ef65f8 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" | |||
19 | SRCREV_machine_qemux86-64 ?= "6ba0d6a225af558654be7619655b0c32ca866bc7" | 19 | SRCREV_machine_qemux86-64 ?= "6ba0d6a225af558654be7619655b0c32ca866bc7" |
20 | SRCREV_machine_qemumips64 ?= "d8c7e535a8dcc7b30213c628e4c4c98e56daad6b" | 20 | SRCREV_machine_qemumips64 ?= "d8c7e535a8dcc7b30213c628e4c4c98e56daad6b" |
21 | SRCREV_machine ?= "6ba0d6a225af558654be7619655b0c32ca866bc7" | 21 | SRCREV_machine ?= "6ba0d6a225af558654be7619655b0c32ca866bc7" |
22 | SRCREV_meta ?= "95cda8806311f4d922919e2eb6581bcb6d08e7f2" | 22 | SRCREV_meta ?= "53a4d48a80a127a3a14a0d3d81f52989fbbf9645" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" | 25 | 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 056fd30e6a..023577d946 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" | |||
19 | SRCREV_machine_qemux86-64 ?= "12f3957167b0001adc7c2c8b3d45127aafc37e6b" | 19 | SRCREV_machine_qemux86-64 ?= "12f3957167b0001adc7c2c8b3d45127aafc37e6b" |
20 | SRCREV_machine_qemumips64 ?= "77ae4b3b45eab133a5daf1e90828e5dfe62062e1" | 20 | SRCREV_machine_qemumips64 ?= "77ae4b3b45eab133a5daf1e90828e5dfe62062e1" |
21 | SRCREV_machine ?= "12f3957167b0001adc7c2c8b3d45127aafc37e6b" | 21 | SRCREV_machine ?= "12f3957167b0001adc7c2c8b3d45127aafc37e6b" |
22 | SRCREV_meta ?= "e09bcd01af6a000647f7d6ec9b864c6ff5ffac89" | 22 | SRCREV_meta ?= "fd79a455524e39c31ea2b8ed7674834d2e4933f4" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" |