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

2 files changed, 17 insertions, 6 deletions

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 07eaa2a4..c1be2433 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,13 +1,12 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-LINUX_VERSION = "3.10.34"
-
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2 = "fri2"
 KBRANCH_fri2 = "standard/fri2"
 KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"
-SRCREV_meta_fri2 = "df3aa753c8826127fb5ad811d56d57168551d6e4"
-SRCREV_machine_fri2 = "c7739be126930006e3bfbdb2fb070a967abc5e09"
+LINUX_VERSION_fri2 = "3.10.35"
+SRCREV_meta_fri2 = "b6e58b33dd427fe471f8827c83e311acdf4558a4"
+SRCREV_machine_fri2 = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
 SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
 SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"
 
@@ -15,8 +14,9 @@ COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
 KMACHINE_fri2-noemgd = "fri2"
 KBRANCH_fri2-noemgd = "standard/fri2"
 KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb"
-SRCREV_meta_fri2-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4"
-SRCREV_machine_fri2-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09"
+LINUX_VERSION_fri2-noemgd = "3.10.35"
+SRCREV_meta_fri2-noemgd = "b6e58b33dd427fe471f8827c83e311acdf4558a4"
+SRCREV_machine_fri2-noemgd = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
 
 module_autoload_iwlwifi = "iwlwifi"
 
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend
new file mode 100644
index 00000000..7098bacb
--- /dev/null
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -0,0 +1,11 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
+KMACHINE_fri2-noemgd = "fri2"
+KBRANCH_fri2-noemgd = "standard/fri2"
+KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb"
+LINUX_VERSION_fri2-noemgd = "3.14.0"
+SRCREV_machine_fri2-noemgd = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
+SRCREV_meta_fri2-noemgd = "fc8c30398dbc3cdea787a1042242d4aab689d0ae"
+
+module_autoload_iwlwifi = "iwlwifi"