summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2013-09-16 21:57:28 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2013-09-18 13:08:56 (GMT)
commit66def4d09cbdf1614622a7ab1d84bef312b5f55d (patch)
treec5803360057ac64cb8915577517e85cc858f1d19
parentb9bea40063ef7a66e31e1a06cfc24332c1c07a9b (diff)
downloadmeta-intel-1.5_M5.rc4.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>
-rw-r--r--meta-crownbay/conf/machine/crownbay-noemgd.conf2
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend9
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend12
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 ab4a93f..1ced7c6 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
9PREFERRED_VERSION_linux-yocto ?= "3.8%" 9PREFERRED_VERSION_linux-yocto ?= "3.10%"
10 10
11require conf/machine/include/tune-atom.inc 11require conf/machine/include/tune-atom.inc
12require conf/machine/include/ia32-base.inc 12require 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 0000000..5c24dcf
--- /dev/null
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
@@ -0,0 +1,9 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
4KMACHINE_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 0000000..36e2015
--- /dev/null
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -0,0 +1,12 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
4KMACHINE_crownbay-noemgd = "crownbay"
5KBRANCH_crownbay-noemgd = "standard/crownbay"
6KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb"
7
8LINUX_VERSION = "3.10.11"
9
10SRCREV_meta_crownbay-noemgd = "285f93bf942e8f6fa678ffc6cc53696ed5400718"
11SRCREV_machine_crownbay-noemgd = "702040ac7c7ec66a29b4d147665ccdd0ff015577"
12