Merge remote-tracking branch 'origin/master' into master-enea

4 files changed, 38 insertions, 12 deletions

diff --git a/common/recipes-kernel/linux/linux-yocto-dev.bbappend b/common/recipes-kernel/linux/linux-yocto-dev.bbappend
index 45b6873a..4fe4088b 100644
--- a/common/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -14,6 +14,6 @@ LINUX_VERSION_corei7-64-intel-common = "3.14-rc8"
 COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
 SRCREV_meta_corei7-64-intel-common = "3689f99f4d2a051e8d3ff72345a67d4d04a88020"
 SRCREV_machine_corei7-64-intel-common = "fecc3fd7d31bd93766ff4f0431fecdbbfa4c3a7c"
-KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64"
-KBRANCH_intel-corei7-64-intel-common = "standard/base"
+KMACHINE_corei7-64-intel-common = "intel-corei7-64"
+KBRANCH_corei7-64-intel-common = "standard/base"
 KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
diff --git a/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
index cfb41930..f4712ef8 100644
--- a/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
@@ -14,6 +14,6 @@ KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
 COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
 #SRCREV_meta_corei7-64-intel-common = "${AUTOREV}"
 #SRCREV_machine_corei7-64-intel-common = "${AUTOREV}"
-KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64"
-KBRANCH_intel-corei7-64-intel-common = "standard/preempt-rt/base"
+KMACHINE_corei7-64-intel-common = "intel-corei7-64"
+KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base"
 KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 902f987e..1ab0a356 100644
--- a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -2,18 +2,18 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 KERNEL_FEATURES_INTEL_COMMON = ""
 
-LINUX_VERSION_core2-32-intel-common = "3.10.34"
+LINUX_VERSION_core2-32-intel-common = "3.10.35"
 COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
-SRCREV_meta_core2-32-intel-common = "df3aa753c8826127fb5ad811d56d57168551d6e4"
-SRCREV_machine_core2-32-intel-common = "c7739be126930006e3bfbdb2fb070a967abc5e09"
+SRCREV_meta_core2-32-intel-common = "b6e58b33dd427fe471f8827c83e311acdf4558a4"
+SRCREV_machine_core2-32-intel-common = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
 KMACHINE_core2-32-intel-common = "intel-core2-32"
 KBRANCH_core2-32-intel-common = "standard/base"
 KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
 
-LINUX_VERSION_corei7-64-intel-common = "3.10.34"
+LINUX_VERSION_corei7-64-intel-common = "3.10.35"
 COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
-SRCREV_meta_corei7-64-intel-common = "df3aa753c8826127fb5ad811d56d57168551d6e4"
-SRCREV_machine_corei7-64-intel-common = "c7739be126930006e3bfbdb2fb070a967abc5e09"
-KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64"
-KBRANCH_intel-corei7-64-intel-common = "standard/base"
+SRCREV_meta_corei7-64-intel-common = "b6e58b33dd427fe471f8827c83e311acdf4558a4"
+SRCREV_machine_corei7-64-intel-common = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
+KMACHINE_corei7-64-intel-common = "intel-corei7-64"
+KBRANCH_corei7-64-intel-common = "standard/base"
 KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
diff --git a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend
new file mode 100644
index 00000000..9c1dd6af
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -0,0 +1,26 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+# For NUC
+KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc"
+
+LINUX_VERSION_core2-32-intel-common = "3.14.0"
+COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
+SRCREV_meta_core2-32-intel-common = "fc8c30398dbc3cdea787a1042242d4aab689d0ae"
+SRCREV_machine_core2-32-intel-common = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
+KMACHINE_core2-32-intel-common = "intel-core2-32"
+KBRANCH_core2-32-intel-common = "standard/base"
+KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
+
+LINUX_VERSION_corei7-64-intel-common = "3.14.0"
+COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
+SRCREV_meta_corei7-64-intel-common = "fc8c30398dbc3cdea787a1042242d4aab689d0ae"
+SRCREV_machine_corei7-64-intel-common = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
+KMACHINE_corei7-64-intel-common = "intel-corei7-64"
+KBRANCH_corei7-64-intel-common = "standard/base"
+KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
+
+# For Crystalforest and Romley
+module_autoload_uio = "uio"
+
+# For FRI2, NUC
+module_autoload_iwlwifi = "iwlwifi"