From 57bcd9c5957fa5572fc3b49db8a427143c17129b Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Wed, 4 Apr 2018 15:58:26 -0700 Subject: linux-yocto/4.12: use meta-intel-compat-kernel.inc instead This sets all the necessary variables. The -rt kernel gains some AUTOLOAD settings, which is fine and should have been the case in the first place. Signed-off-by: California Sullivan --- recipes-kernel/linux/linux-yocto-rt_4.12.bbappend | 10 +--------- recipes-kernel/linux/linux-yocto_4.12.bbappend | 18 +----------------- 2 files changed, 2 insertions(+), 26 deletions(-) (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/linux-yocto-rt_4.12.bbappend b/recipes-kernel/linux/linux-yocto-rt_4.12.bbappend index de336b04..daa7dd6b 100644 --- a/recipes-kernel/linux/linux-yocto-rt_4.12.bbappend +++ b/recipes-kernel/linux/linux-yocto-rt_4.12.bbappend @@ -1,9 +1 @@ -KERNEL_FEATURES_INTEL_COMMON ?= "" - -COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" -KMACHINE_core2-32-intel-common = "intel-core2-32" -KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" - -COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" -KMACHINE_corei7-64-intel-common = "intel-corei7-64" -KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" +require meta-intel-compat-kernel.inc diff --git a/recipes-kernel/linux/linux-yocto_4.12.bbappend b/recipes-kernel/linux/linux-yocto_4.12.bbappend index b99001ed..daa7dd6b 100644 --- a/recipes-kernel/linux/linux-yocto_4.12.bbappend +++ b/recipes-kernel/linux/linux-yocto_4.12.bbappend @@ -1,17 +1 @@ -KERNEL_FEATURES_INTEL_COMMON ?= "" - -COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" -KMACHINE_core2-32-intel-common = "intel-core2-32" -KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" - -COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" -KMACHINE_corei7-64-intel-common = "intel-corei7-64" -KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" - -# For Crystalforest and Romley -KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" -KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" - -# For FRI2, NUC -KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi" -KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi" +require meta-intel-compat-kernel.inc -- cgit v1.2.3-54-g00ecf