MIRRORS/meta-intel
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

linux-yocto: Use _append when overrides are used

Browse Source 
Some modules in the KERNEL_MODULE_AUTOLOAD list were removed when including
the meta-intel layer. It turns out the problem happens due to using the +=
operator together with machine overrides. Using _append_machine fixes this.

Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
Acked-By: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
This commit is contained in:
Josep Puigdemont 2014-07-17 18:36:31 +02:00 committed by Tom Zanussi
parent 00de64dbe0
commit b89a7c533d
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/recipes-kernel/linux/linux-yocto-dev.bbappend
View File

@ -19,9 +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_core2-32-intel-common += "uio"
KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "uio"
KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"
KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio"
# For FRI2, NUC
KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "iwlwifi"
KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "iwlwifi"
KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi"
KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi"

8
common/recipes-kernel/linux/linux-yocto_3.10.bbappend
View File

@ -21,9 +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_core2-32-intel-common += "uio"
KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "uio"
KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"
KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio"
# For FRI2, NUC
KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "iwlwifi"
KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "iwlwifi"
KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi"
KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi"

8
common/recipes-kernel/linux/linux-yocto_3.14.bbappend
View File

@ -20,9 +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_core2-32-intel-common += "uio"
KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "uio"
KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"
KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio"
# For FRI2, NUC
KERNEL_MODULE_AUTOLOAD_core2-32-intel-common += "iwlwifi"
KERNEL_MODULE_AUTOLOAD_corei7-64-intel-common += "iwlwifi"
KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi"
KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi"

4
meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
View File

@ -12,5 +12,5 @@ KBRANCH_fri2-noemgd = "standard/preempt-rt/fri2"
SRCREV_machine_pn-linux-yocto-rt_fri2-noemgd ?= "b669af08737562ef86e7cba328966d05222d3e64"
#SRCREV_meta_pn-linux-yocto-rt_fri2-noemgd ?= "XXX"
KERNEL_MODULE_AUTOLOAD_fri2 += "iwlwifi"
KERNEL_MODULE_AUTOLOAD_fri2-noemgd += "iwlwifi"
KERNEL_MODULE_AUTOLOAD_append_fri2 = " iwlwifi"
KERNEL_MODULE_AUTOLOAD_append_fri2-noemgd = " iwlwifi"

4
meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
View File

@ -18,5 +18,5 @@ LINUX_VERSION_fri2-noemgd = "3.10.38"
SRCREV_meta_fri2-noemgd = "e1f26aeccfd43bc3d7e95873ceda469b631b8473"
SRCREV_machine_fri2-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388"
KERNEL_MODULE_AUTOLOAD_fri2 += "iwlwifi"
KERNEL_MODULE_AUTOLOAD_fri2-noemgd += "iwlwifi"
KERNEL_MODULE_AUTOLOAD_append_fri2 = " iwlwifi"
KERNEL_MODULE_AUTOLOAD_append_fri2-noemgd = " iwlwifi"

4
meta-isg/meta-valleyisland/recipes-kernel/linux/linux-yocto_3.10.bbappend
View File

@ -32,5 +32,5 @@ SRCREV_valleyisland-io_valleyisland-64 = "8ea4fb625f2654bbdd5dfcb9db67328d21ebe5
SRC_URI_valleyisland-64 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},valleyisland-io-1.0;name=machine,meta,valleyisland-io"
KERNEL_MODULE_AUTOLOAD_valleyisland-32 += "i2c-dev"
KERNEL_MODULE_AUTOLOAD_valleyisland-64 += "i2c-dev"
KERNEL_MODULE_AUTOLOAD_append_valleyisland-32 = " i2c-dev"
KERNEL_MODULE_AUTOLOAD_append_valleyisland-64 = " i2c-dev"