diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2014-06-26 14:22:10 +0000 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2014-06-26 14:22:10 +0000 |
| commit | 05dd98cf5c117a8bdd566d36d20a84fff20e8cc3 (patch) | |
| tree | eedb3499fcc3881c9c3bd8275e8f0269fbc3b3cd /common | |
| parent | 76f529881208811e314dba1478cc3a70abf3160f (diff) | |
| download | meta-intel-05dd98cf5c117a8bdd566d36d20a84fff20e8cc3.tar.gz | |
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 <dvhart@linux.intel.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-dev.bbappend | 8 | ||||
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto_3.10.bbappend | 6 | ||||
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto_3.14.bbappend | 6 |
3 files changed, 13 insertions, 7 deletions
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} | |||
| 19 | # default SRCREV is set and linux-yocto-dev is the preferred provider. | 19 | # default SRCREV is set and linux-yocto-dev is the preferred provider. |
| 20 | 20 | ||
| 21 | # For Crystalforest and Romley | 21 | # For Crystalforest and Romley |
| 22 | KERNEL_MODULE_AUTOLOAD += "uio" | 22 | KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "uio" |
| 23 | KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "uio" | ||
| 23 | 24 | ||
| 24 | # For FRI2 | 25 | # For FRI2, NUC |
| 25 | KERNEL_MODULE_AUTOLOAD += "iwlwifi" | 26 | KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "iwlwifi" |
| 27 | 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" | |||
| 21 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 21 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
| 22 | 22 | ||
| 23 | # For Crystalforest and Romley | 23 | # For Crystalforest and Romley |
| 24 | KERNEL_MODULE_AUTOLOAD += "uio" | 24 | KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "uio" |
| 25 | KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "uio" | ||
| 25 | 26 | ||
| 26 | # For FRI2, NUC | 27 | # For FRI2, NUC |
| 27 | KERNEL_MODULE_AUTOLOAD += "iwlwifi" | 28 | KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "iwlwifi" |
| 29 | 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" | |||
| 20 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 20 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
| 21 | 21 | ||
| 22 | # For Crystalforest and Romley | 22 | # For Crystalforest and Romley |
| 23 | KERNEL_MODULE_AUTOLOAD += "uio" | 23 | KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "uio" |
| 24 | KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "uio" | ||
| 24 | 25 | ||
| 25 | # For FRI2, NUC | 26 | # For FRI2, NUC |
| 26 | KERNEL_MODULE_AUTOLOAD += "iwlwifi" | 27 | KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "iwlwifi" |
| 28 | KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "iwlwifi" | ||