From 05dd98cf5c117a8bdd566d36d20a84fff20e8cc3 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Thu, 26 Jun 2014 14:22:10 +0000 Subject: linux-yocto: Make KERNEL_MODULE_AUTOLOAD machine specific BSP linux-yocto bbappend files should make all variable updates with machine-specific overrides. As it stands, building qemux86 with meta-intel in BBLAYERS will add uio and iwlwifi to KERNEL_MODULES_AUTOLOAD. This corrects that. Signed-off-by: Darren Hart --- common/recipes-kernel/linux/linux-yocto-dev.bbappend | 8 +++++--- common/recipes-kernel/linux/linux-yocto_3.10.bbappend | 6 ++++-- common/recipes-kernel/linux/linux-yocto_3.14.bbappend | 6 ++++-- 3 files changed, 13 insertions(+), 7 deletions(-) (limited to 'common/recipes-kernel/linux') diff --git a/common/recipes-kernel/linux/linux-yocto-dev.bbappend b/common/recipes-kernel/linux/linux-yocto-dev.bbappend index 71e40957..ddc1c4a4 100644 --- a/common/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -19,7 +19,9 @@ KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} # default SRCREV is set and linux-yocto-dev is the preferred provider. # For Crystalforest and Romley -KERNEL_MODULE_AUTOLOAD += "uio" +KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "uio" +KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "uio" -# For FRI2 -KERNEL_MODULE_AUTOLOAD += "iwlwifi" +# For FRI2, NUC +KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "iwlwifi" +KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "iwlwifi" diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend index bbce8f4a..a142e5be 100644 --- a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -21,7 +21,9 @@ KBRANCH_corei7-64-intel-common = "standard/base" KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" # For Crystalforest and Romley -KERNEL_MODULE_AUTOLOAD += "uio" +KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "uio" +KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "uio" # For FRI2, NUC -KERNEL_MODULE_AUTOLOAD += "iwlwifi" +KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "iwlwifi" +KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "iwlwifi" diff --git a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend index 139c1f0a..a0ca5fcd 100644 --- a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend @@ -20,7 +20,9 @@ KBRANCH_corei7-64-intel-common = "standard/base" KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" # For Crystalforest and Romley -KERNEL_MODULE_AUTOLOAD += "uio" +KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "uio" +KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "uio" # For FRI2, NUC -KERNEL_MODULE_AUTOLOAD += "iwlwifi" +KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "iwlwifi" +KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "iwlwifi" -- cgit v1.2.3-54-g00ecf