diff options
author | Saul Wold <sgw@linux.intel.com> | 2017-07-25 13:52:47 -0700 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2017-07-31 09:00:58 -0700 |
commit | d0ba6fc045dffda5aa1e6e015b926615febfbf9f (patch) | |
tree | ea566a26f5381fe426d9db452db6cc74134e85e2 /common/recipes-kernel | |
parent | 3dfbb5cd08acf4300a4336177e0a8f511a460b01 (diff) | |
download | meta-intel-d0ba6fc045dffda5aa1e6e015b926615febfbf9f.tar.gz |
linux-intel: refactor and remove iwlwifi modules for out of tree enablement
Create a linux-intel.inc that is shared between standard and rt kernel
for the common bits.
By removing these modules here, we can then build and install the
out of tree modules from the backport-iwlwifi tree.
Move the Autoloading to the kernel module also
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'common/recipes-kernel')
-rw-r--r-- | common/recipes-kernel/linux/linux-intel-rt_4.9.bb | 27 | ||||
-rw-r--r-- | common/recipes-kernel/linux/linux-intel.inc | 39 | ||||
-rw-r--r-- | common/recipes-kernel/linux/linux-intel_4.9.bb | 33 |
3 files changed, 41 insertions, 58 deletions
diff --git a/common/recipes-kernel/linux/linux-intel-rt_4.9.bb b/common/recipes-kernel/linux/linux-intel-rt_4.9.bb index 55015941..f34c6f54 100644 --- a/common/recipes-kernel/linux/linux-intel-rt_4.9.bb +++ b/common/recipes-kernel/linux/linux-intel-rt_4.9.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | require recipes-kernel/linux/linux-yocto.inc | 2 | require linux-intel.inc |
3 | 3 | ||
4 | # Skip processing of this recipe if it is not explicitly specified as the | 4 | # Skip processing of this recipe if it is not explicitly specified as the |
5 | # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying | 5 | # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying |
@@ -14,29 +14,4 @@ KBRANCH = "base-rt" | |||
14 | SRCREV_machine ?= "cd65d037683c92be2c7dedc846f4bfd9ef84ecf4" | 14 | SRCREV_machine ?= "cd65d037683c92be2c7dedc846f4bfd9ef84ecf4" |
15 | SRCREV_meta ?= "299f12a06ca1d6fd90b24450dae3b9f257a536be" | 15 | SRCREV_meta ?= "299f12a06ca1d6fd90b24450dae3b9f257a536be" |
16 | 16 | ||
17 | SRC_URI = "git://github.com/01org/linux-intel-4.9.git;protocol=https;name=machine;branch=${KBRANCH}; \ | ||
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" | ||
19 | |||
20 | LINUX_VERSION ?= "4.9.30" | ||
21 | LINUX_VERSION_EXTENSION ?= "-intel-pk-${LINUX_KERNEL_TYPE}" | ||
22 | |||
23 | |||
24 | PV = "${LINUX_VERSION}+git${SRCPV}" | ||
25 | |||
26 | KMETA = "kernel-meta" | ||
27 | KCONF_BSP_AUDIT_LEVEL = "2" | ||
28 | |||
29 | LINUX_KERNEL_TYPE = "preempt-rt" | 17 | LINUX_KERNEL_TYPE = "preempt-rt" |
30 | KERNEL_FEATURES_INTEL_COMMON ?= "" | ||
31 | |||
32 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
33 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
34 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
35 | |||
36 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
37 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
38 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
39 | |||
40 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
41 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
42 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" | ||
diff --git a/common/recipes-kernel/linux/linux-intel.inc b/common/recipes-kernel/linux/linux-intel.inc new file mode 100644 index 00000000..f3fbd59a --- /dev/null +++ b/common/recipes-kernel/linux/linux-intel.inc | |||
@@ -0,0 +1,39 @@ | |||
1 | require recipes-kernel/linux/linux-yocto.inc | ||
2 | |||
3 | SRC_URI = "git://github.com/01org/linux-intel-4.9.git;protocol=https;name=machine;branch=${KBRANCH}; \ | ||
4 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" | ||
5 | |||
6 | |||
7 | LINUX_VERSION ?= "4.9.30" | ||
8 | LINUX_VERSION_EXTENSION ?= "-intel-pk-${LINUX_KERNEL_TYPE}" | ||
9 | |||
10 | PV = "${LINUX_VERSION}+git${SRCPV}" | ||
11 | |||
12 | KMETA = "kernel-meta" | ||
13 | KCONF_BSP_AUDIT_LEVEL = "2" | ||
14 | |||
15 | KERNEL_FEATURES_INTEL_COMMON ?= "" | ||
16 | |||
17 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
18 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
19 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
20 | |||
21 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
22 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
23 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
24 | |||
25 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
26 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
27 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "features/qat/qat.scc" | ||
28 | |||
29 | # Functionality flags | ||
30 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" | ||
31 | KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" | ||
32 | |||
33 | do_compile_kernelmodules_append() { | ||
34 | rm -rf ${B}/drivers/net/wireless/intel/iwlwifi | ||
35 | rm -rf ${B}/net/mac80211 | ||
36 | rm -rf ${B}/net/wireless | ||
37 | } | ||
38 | |||
39 | RDEPENDS_kernel-modules += "iwlwifi" | ||
diff --git a/common/recipes-kernel/linux/linux-intel_4.9.bb b/common/recipes-kernel/linux/linux-intel_4.9.bb index 51506555..9e017aaa 100644 --- a/common/recipes-kernel/linux/linux-intel_4.9.bb +++ b/common/recipes-kernel/linux/linux-intel_4.9.bb | |||
@@ -1,44 +1,13 @@ | |||
1 | 1 | ||
2 | require recipes-kernel/linux/linux-yocto.inc | 2 | require linux-intel.inc |
3 | 3 | ||
4 | KBRANCH = "base" | 4 | KBRANCH = "base" |
5 | SRCREV_machine ?= "22a3e397584619839ec645c7378dc40bdd5ad2d1" | 5 | SRCREV_machine ?= "22a3e397584619839ec645c7378dc40bdd5ad2d1" |
6 | SRCREV_meta ?= "299f12a06ca1d6fd90b24450dae3b9f257a536be" | 6 | SRCREV_meta ?= "299f12a06ca1d6fd90b24450dae3b9f257a536be" |
7 | 7 | ||
8 | SRC_URI = "git://github.com/01org/linux-intel-4.9.git;protocol=https;name=machine;branch=${KBRANCH}; \ | ||
9 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" | ||
10 | |||
11 | LINUX_VERSION ?= "4.9.30" | ||
12 | LINUX_VERSION_EXTENSION = "-intel-pk-${LINUX_KERNEL_TYPE}" | ||
13 | |||
14 | PV = "${LINUX_VERSION}+git${SRCPV}" | ||
15 | |||
16 | KMETA = "kernel-meta" | ||
17 | KCONF_BSP_AUDIT_LEVEL = "2" | ||
18 | |||
19 | KERNEL_FEATURES_INTEL_COMMON ?= "" | ||
20 | |||
21 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
22 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
23 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
24 | |||
25 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
26 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
27 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
28 | |||
29 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
30 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
31 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" | ||
32 | |||
33 | # For Crystalforest and Romley | 8 | # For Crystalforest and Romley |
34 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" | 9 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" |
35 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" | 10 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" |
36 | 11 | ||
37 | # For FRI2, NUC | ||
38 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi" | ||
39 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi" | ||
40 | |||
41 | # Functionality flags | 12 | # Functionality flags |
42 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" | 13 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" |
43 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" | ||
44 | KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" | ||