diff options
author | George Nita <george.nita@enea.com> | 2014-05-06 05:26:24 +0200 |
---|---|---|
committer | George Nita <george.nita@enea.com> | 2014-05-06 05:26:24 +0200 |
commit | 5d98064044ef8588ad7c884c8f0feb34e8bdbb9d (patch) | |
tree | ee5a6d18181e192b9089f189561ccd134410897e /common | |
parent | 5d093e6f841cc82f072fd1b19573628392ca640a (diff) | |
parent | d8e9e84375949ea82dadf214a04e94a2f871f5ce (diff) | |
download | meta-intel-enea-linux-4.0.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 'common')
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto_3.10.bbappend | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend index 1ab0a356..003d8354 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}:" | |||
2 | 2 | ||
3 | KERNEL_FEATURES_INTEL_COMMON = "" | 3 | KERNEL_FEATURES_INTEL_COMMON = "" |
4 | 4 | ||
5 | LINUX_VERSION_core2-32-intel-common = "3.10.35" | 5 | LINUX_VERSION_core2-32-intel-common = "3.10.38" |
6 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | 6 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" |
7 | SRCREV_meta_core2-32-intel-common = "b6e58b33dd427fe471f8827c83e311acdf4558a4" | 7 | SRCREV_meta_core2-32-intel-common = "1eb79862c2959cfa305773e7f785d6d1810bf190" |
8 | SRCREV_machine_core2-32-intel-common = "cee957655fe67826b2e827e2db41f156fa8f0cc4" | 8 | SRCREV_machine_core2-32-intel-common = "02f7e63e56c061617957388c23bd5cf9b05c5388" |
9 | KMACHINE_core2-32-intel-common = "intel-core2-32" | 9 | KMACHINE_core2-32-intel-common = "intel-core2-32" |
10 | KBRANCH_core2-32-intel-common = "standard/base" | 10 | KBRANCH_core2-32-intel-common = "standard/base" |
11 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 11 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
12 | 12 | ||
13 | LINUX_VERSION_corei7-64-intel-common = "3.10.35" | 13 | LINUX_VERSION_corei7-64-intel-common = "3.10.38" |
14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
15 | SRCREV_meta_corei7-64-intel-common = "b6e58b33dd427fe471f8827c83e311acdf4558a4" | 15 | SRCREV_meta_corei7-64-intel-common = "1eb79862c2959cfa305773e7f785d6d1810bf190" |
16 | SRCREV_machine_corei7-64-intel-common = "cee957655fe67826b2e827e2db41f156fa8f0cc4" | 16 | SRCREV_machine_corei7-64-intel-common = "02f7e63e56c061617957388c23bd5cf9b05c5388" |
17 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | 17 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" |
18 | KBRANCH_corei7-64-intel-common = "standard/base" | 18 | KBRANCH_corei7-64-intel-common = "standard/base" |
19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |