summaryrefslogtreecommitdiffstats
path: root/meta-fri2/recipes-kernel/linux
diff options
context:
space:
mode:
authorGeorge Nita <george.nita@enea.com>2014-05-06 03:26:24 (GMT)
committerGeorge Nita <george.nita@enea.com>2014-05-06 03:26:24 (GMT)
commit5d98064044ef8588ad7c884c8f0feb34e8bdbb9d (patch)
treeee5a6d18181e192b9089f189561ccd134410897e /meta-fri2/recipes-kernel/linux
parent5d093e6f841cc82f072fd1b19573628392ca640a (diff)
parentd8e9e84375949ea82dadf214a04e94a2f871f5ce (diff)
downloadmeta-intel-5d98064044ef8588ad7c884c8f0feb34e8bdbb9d.tar.gz
Merge remote-tracking branch 'origin/daisy' into daisy-eneaenea-linux-4.0-rt-test1enea-linux-4.0-rc3enea-linux-4.0daisy-enea-mandaisy-enea
Diffstat (limited to 'meta-fri2/recipes-kernel/linux')
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend12
1 files changed, 6 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 c1be243..8c442ab 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -4,9 +4,9 @@ COMPATIBLE_MACHINE_fri2 = "fri2"
4KMACHINE_fri2 = "fri2" 4KMACHINE_fri2 = "fri2"
5KBRANCH_fri2 = "standard/fri2" 5KBRANCH_fri2 = "standard/fri2"
6KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" 6KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"
7LINUX_VERSION_fri2 = "3.10.35" 7LINUX_VERSION_fri2 = "3.10.38"
8SRCREV_meta_fri2 = "b6e58b33dd427fe471f8827c83e311acdf4558a4" 8SRCREV_meta_fri2 = "1eb79862c2959cfa305773e7f785d6d1810bf190"
9SRCREV_machine_fri2 = "cee957655fe67826b2e827e2db41f156fa8f0cc4" 9SRCREV_machine_fri2 = "02f7e63e56c061617957388c23bd5cf9b05c5388"
10SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" 10SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
11SRC_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" 11SRC_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"
12 12
@@ -14,9 +14,9 @@ COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
14KMACHINE_fri2-noemgd = "fri2" 14KMACHINE_fri2-noemgd = "fri2"
15KBRANCH_fri2-noemgd = "standard/fri2" 15KBRANCH_fri2-noemgd = "standard/fri2"
16KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" 16KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb"
17LINUX_VERSION_fri2-noemgd = "3.10.35" 17LINUX_VERSION_fri2-noemgd = "3.10.38"
18SRCREV_meta_fri2-noemgd = "b6e58b33dd427fe471f8827c83e311acdf4558a4" 18SRCREV_meta_fri2-noemgd = "1eb79862c2959cfa305773e7f785d6d1810bf190"
19SRCREV_machine_fri2-noemgd = "cee957655fe67826b2e827e2db41f156fa8f0cc4" 19SRCREV_machine_fri2-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388"
20 20
21module_autoload_iwlwifi = "iwlwifi" 21module_autoload_iwlwifi = "iwlwifi"
22 22