diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-09-16 16:57:28 -0500 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2013-09-18 08:08:56 -0500 |
commit | 66def4d09cbdf1614622a7ab1d84bef312b5f55d (patch) | |
tree | c5803360057ac64cb8915577517e85cc858f1d19 | |
parent | b9bea40063ef7a66e31e1a06cfc24332c1c07a9b (diff) | |
download | meta-intel-66def4d09cbdf1614622a7ab1d84bef312b5f55d.tar.gz |
meta-crownbay: move crownbay-noemgd to linux-yocto-3.101.5_M5.rc41.5_M5.rc3
Add linux-yocto_3.10 bbappends to meta-crownbay and switch
crownbay-noemgd to use them.
Leave crownbay at 3.8, since the EMGD kernel branch hasn't yet been
made to work with 3.10.
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
3 files changed, 22 insertions, 1 deletions
diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf index ab4a93fc..1ced7c67 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.8%" | 9 | PREFERRED_VERSION_linux-yocto ?= "3.10%" |
10 | 10 | ||
11 | require conf/machine/include/tune-atom.inc | 11 | require conf/machine/include/tune-atom.inc |
12 | require conf/machine/include/ia32-base.inc | 12 | require conf/machine/include/ia32-base.inc |
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend new file mode 100644 index 00000000..5c24dcf3 --- /dev/null +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend | |||
@@ -0,0 +1,9 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" | ||
4 | KMACHINE_crownbay-noemgd = "crownbay" | ||
5 | |||
6 | # Update the following to use a different BSP branch or meta SRCREV | ||
7 | #KBRANCH_crownbay-noemgd = "standard/preempt-rt/base" | ||
8 | #SRCREV_machine_pn-linux-yocto-rt_crownbay-noemgd ?= XXXX | ||
9 | #SRCREV_meta_pn-linux-yocto-rt_crownbay-noemgd ?= XXXX | ||
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend new file mode 100644 index 00000000..36e2015d --- /dev/null +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend | |||
@@ -0,0 +1,12 @@ | |||
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 = "3.10.11" | ||
9 | |||
10 | SRCREV_meta_crownbay-noemgd = "285f93bf942e8f6fa678ffc6cc53696ed5400718" | ||
11 | SRCREV_machine_crownbay-noemgd = "702040ac7c7ec66a29b4d147665ccdd0ff015577" | ||
12 | |||