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>

6 files changed, 19 insertions, 10 deletions

diff --git a/common/recipes-kernel/linux/linux-yocto-dev.bbappend b/common/recipes-kernel/linux/linux-yocto-dev.bbappend
index 71e4095..ddc1c4a 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 bbce8f4..a142e5b 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 139c1f0..a0ca5fc 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"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
index 7aaf53a..e57449f 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
@@ -12,4 +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 += "iwlwifi"
+KERNEL_MODULE_AUTOLOAD_fri2 += "iwlwifi"
+KERNEL_MODULE_AUTOLOAD_fri2-noemgd += "iwlwifi"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 14bb81a..a4732f2 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -18,4 +18,5 @@ LINUX_VERSION_fri2-noemgd = "3.10.38"
 SRCREV_meta_fri2-noemgd = "e1f26aeccfd43bc3d7e95873ceda469b631b8473"
 SRCREV_machine_fri2-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388"
 
-KERNEL_MODULE_AUTOLOAD += "iwlwifi"
+KERNEL_MODULE_AUTOLOAD_fri2 += "iwlwifi"
+KERNEL_MODULE_AUTOLOAD_fri2-noemgd += "iwlwifi"
diff --git a/meta-isg/meta-valleyisland/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-isg/meta-valleyisland/recipes-kernel/linux/linux-yocto_3.10.bbappend
index e329712..c691a42 100644
--- a/meta-isg/meta-valleyisland/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-isg/meta-valleyisland/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -32,4 +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 += "i2c-dev"
+KERNEL_MODULE_AUTOLOAD_valleyisland-32 += "i2c-dev"
+KERNEL_MODULE_AUTOLOAD_valleyisland-64 += "i2c-dev"