summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2014-06-18 00:47:44 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2014-06-23 14:47:47 (GMT)
commitbf97ece14e1444e3898798599a4299ad1c7556c6 (patch)
tree55a3d8408685d9339c87e1ea98b09395cbd474ad
parent6aa0c6a6a75f6a4c2fda8e59be1212464307c69a (diff)
downloadmeta-intel-bf97ece14e1444e3898798599a4299ad1c7556c6.tar.gz
linux-yocto recipes: fix use of module_autoload_* vars
oecore/poky layer changed, needing replacement of all the module_autoload_* recipe variables by the KERNEL_MODULE_AUTOLOAD variable. This fixes these kind of buildtime errors coming from the meta-intel layer: ERROR: KERNEL_MODULE_AUTOLOAD has replaced module_autoload_iwlwifi, please replace it! Addresses bug: [YOCTO #6460] Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--common/recipes-kernel/linux/linux-yocto-dev.bbappend4
-rw-r--r--common/recipes-kernel/linux/linux-yocto_3.10.bbappend4
-rw-r--r--common/recipes-kernel/linux/linux-yocto_3.14.bbappend4
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend2
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend3
-rw-r--r--meta-isg/meta-valleyisland/recipes-kernel/linux/linux-yocto_3.10.bbappend2
6 files changed, 9 insertions, 10 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-dev.bbappend b/common/recipes-kernel/linux/linux-yocto-dev.bbappend
index b8c06df..71e4095 100644
--- a/common/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -19,7 +19,7 @@ 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
22module_autoload_uio = "uio" 22KERNEL_MODULE_AUTOLOAD += "uio"
23 23
24# For FRI2 24# For FRI2
25module_autoload_iwlwifi = "iwlwifi" 25KERNEL_MODULE_AUTOLOAD += "iwlwifi"
diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 3bb5343..bbce8f4 100644
--- a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -21,7 +21,7 @@ KBRANCH_corei7-64-intel-common = "standard/base"
21KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 21KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
22 22
23# For Crystalforest and Romley 23# For Crystalforest and Romley
24module_autoload_uio = "uio" 24KERNEL_MODULE_AUTOLOAD += "uio"
25 25
26# For FRI2, NUC 26# For FRI2, NUC
27module_autoload_iwlwifi = "iwlwifi" 27KERNEL_MODULE_AUTOLOAD += "iwlwifi"
diff --git a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend
index 3c34f09..139c1f0 100644
--- a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -20,7 +20,7 @@ KBRANCH_corei7-64-intel-common = "standard/base"
20KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 20KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
21 21
22# For Crystalforest and Romley 22# For Crystalforest and Romley
23module_autoload_uio = "uio" 23KERNEL_MODULE_AUTOLOAD += "uio"
24 24
25# For FRI2, NUC 25# For FRI2, NUC
26module_autoload_iwlwifi = "iwlwifi" 26KERNEL_MODULE_AUTOLOAD += "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 557cba1..7aaf53a 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,4 @@ KBRANCH_fri2-noemgd = "standard/preempt-rt/fri2"
12SRCREV_machine_pn-linux-yocto-rt_fri2-noemgd ?= "b669af08737562ef86e7cba328966d05222d3e64" 12SRCREV_machine_pn-linux-yocto-rt_fri2-noemgd ?= "b669af08737562ef86e7cba328966d05222d3e64"
13#SRCREV_meta_pn-linux-yocto-rt_fri2-noemgd ?= "XXX" 13#SRCREV_meta_pn-linux-yocto-rt_fri2-noemgd ?= "XXX"
14 14
15module_autoload_iwlwifi = "iwlwifi" 15KERNEL_MODULE_AUTOLOAD += "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 36907a5..14bb81a 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -18,5 +18,4 @@ LINUX_VERSION_fri2-noemgd = "3.10.38"
18SRCREV_meta_fri2-noemgd = "e1f26aeccfd43bc3d7e95873ceda469b631b8473" 18SRCREV_meta_fri2-noemgd = "e1f26aeccfd43bc3d7e95873ceda469b631b8473"
19SRCREV_machine_fri2-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388" 19SRCREV_machine_fri2-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388"
20 20
21module_autoload_iwlwifi = "iwlwifi" 21KERNEL_MODULE_AUTOLOAD += "iwlwifi"
22
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 34e28c1..e329712 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,4 @@ SRCREV_valleyisland-io_valleyisland-64 = "8ea4fb625f2654bbdd5dfcb9db67328d21ebe5
32 32
33SRC_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" 33SRC_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"
34 34
35module_autoload_i2c-dev = "i2c-dev" 35KERNEL_MODULE_AUTOLOAD += "i2c-dev"