diff options
author | George Nita <george.nita@enea.com> | 2014-04-05 05:25:43 +0200 |
---|---|---|
committer | George Nita <george.nita@enea.com> | 2014-04-05 05:25:43 +0200 |
commit | fa96c2ca5e4f882adadcb3b90e09bc0abf2f76fc (patch) | |
tree | 1a22b4521591d980819dcd0d90b7964f8d6b1a32 /meta-crownbay | |
parent | 6ef83e1cb65080174a888faef3a0791158f10ee4 (diff) | |
parent | b26946e8e7f1f3bb68625731b493156309449f5d (diff) | |
download | meta-intel-fa96c2ca5e4f882adadcb3b90e09bc0abf2f76fc.tar.gz |
Merge remote-tracking branch 'origin/master' into master-enea
Diffstat (limited to 'meta-crownbay')
3 files changed, 17 insertions, 7 deletions
diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf index 42bbfb12..307d9bd2 100644 --- a/meta-crownbay/conf/machine/crownbay-noemgd.conf +++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf | |||
@@ -6,7 +6,7 @@ | |||
6 | #@DESCRIPTION: Machine configuration for Crown Bay systems, without Intel-proprietary graphics bits | 6 | #@DESCRIPTION: Machine configuration for Crown Bay systems, without Intel-proprietary graphics bits |
7 | # i.e. E660 + EG20T | 7 | # i.e. E660 + EG20T |
8 | 8 | ||
9 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 9 | PREFERRED_VERSION_linux-yocto ?= "3.14%" |
10 | 10 | ||
11 | require conf/machine/include/intel-core2-32-common.inc | 11 | require conf/machine/include/intel-core2-32-common.inc |
12 | 12 | ||
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend index 1b7ff84c..15d8b899 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend | |||
@@ -11,13 +11,13 @@ KMACHINE_crownbay-noemgd = "crownbay" | |||
11 | KBRANCH_crownbay-noemgd = "standard/crownbay" | 11 | KBRANCH_crownbay-noemgd = "standard/crownbay" |
12 | KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" | 12 | KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" |
13 | 13 | ||
14 | LINUX_VERSION = "3.10.34" | 14 | LINUX_VERSION_crownbay = "3.10.35" |
15 | 15 | SRCREV_meta_crownbay = "b6e58b33dd427fe471f8827c83e311acdf4558a4" | |
16 | SRCREV_meta_crownbay = "df3aa753c8826127fb5ad811d56d57168551d6e4" | 16 | SRCREV_machine_crownbay = "cee957655fe67826b2e827e2db41f156fa8f0cc4" |
17 | SRCREV_machine_crownbay = "c7739be126930006e3bfbdb2fb070a967abc5e09" | ||
18 | SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" | 17 | SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" |
19 | 18 | ||
20 | SRCREV_meta_crownbay-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" | 19 | LINUX_VERSION_crownbay-noemgd = "3.10.35" |
21 | SRCREV_machine_crownbay-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09" | 20 | SRCREV_meta_crownbay-noemgd = "b6e58b33dd427fe471f8827c83e311acdf4558a4" |
21 | SRCREV_machine_crownbay-noemgd = "cee957655fe67826b2e827e2db41f156fa8f0cc4" | ||
22 | 22 | ||
23 | SRC_URI_crownbay = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" | 23 | SRC_URI_crownbay = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" |
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.14.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.14.bbappend new file mode 100644 index 00000000..60ebd446 --- /dev/null +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.14.bbappend | |||
@@ -0,0 +1,10 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" | ||
4 | KMACHINE_crownbay-noemgd = "crownbay" | ||
5 | KBRANCH_crownbay-noemgd = "standard/crownbay" | ||
6 | KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" | ||
7 | |||
8 | LINUX_VERSION_crownbay-noemgd = "3.14.0" | ||
9 | SRCREV_machine_crownbay-noemgd = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | ||
10 | SRCREV_meta_crownbay-noemgd = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" | ||