summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-07-17 22:07:15 -0500
committerTom Zanussi <tom.zanussi@intel.com>2012-07-17 22:07:15 -0500
commit5d0c08cd8bb3f3ce8d23b4ae8b844bba15278049 (patch)
treea2e87c1ce1ac0131fb09281a0d48b1477b697b7a
parenta944332ecfa59247cc0787c55d79a6392e3218bd (diff)
downloadmeta-intel-5d0c08cd8bb3f3ce8d23b4ae8b844bba15278049.tar.gz
meta-chiefriver: switch to linux-yocto-3.4 kernel
Switch chiefriver to the 3.4 kernel and update kernel SRCREVs. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-chiefriver/conf/machine/chiefriver.conf2
-rw-r--r--meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend8
-rw-r--r--meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend10
3 files changed, 19 insertions, 1 deletions
diff --git a/meta-chiefriver/conf/machine/chiefriver.conf b/meta-chiefriver/conf/machine/chiefriver.conf
index 4a359135..b644119c 100644
--- a/meta-chiefriver/conf/machine/chiefriver.conf
+++ b/meta-chiefriver/conf/machine/chiefriver.conf
@@ -4,7 +4,7 @@
4#@DESCRIPTION: Machine configuration for Chief River systems 4#@DESCRIPTION: Machine configuration for Chief River systems
5# i.e. Ivy Bridge + Panther Point 5# i.e. Ivy Bridge + Panther Point
6 6
7PREFERRED_VERSION_linux-yocto ?= "3.2%" 7PREFERRED_VERSION_linux-yocto ?= "3.4%"
8 8
9require conf/machine/include/tune-x86_64.inc 9require conf/machine/include/tune-x86_64.inc
10require conf/machine/include/ia32-base.inc 10require conf/machine/include/ia32-base.inc
diff --git a/meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
new file mode 100644
index 00000000..9e4a4a07
--- /dev/null
+++ b/meta-chiefriver/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
@@ -0,0 +1,8 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2COMPATIBLE_MACHINE_chiefriver = "chiefriver"
3KMACHINE_chiefriver = "chiefriver"
4
5# Update the following to use a different BSP branch or meta SRCREV
6#KBRANCH_chiefriver = "standard/preempt-rt/base"
7#SRCREV_machine_pn-linux-yocto-rt_chiefriver ?= XXXX
8#SRCREV_meta_pn-linux-yocto-rt_chiefriver ?= XXXX
diff --git a/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend
new file mode 100644
index 00000000..3b8c6f32
--- /dev/null
+++ b/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -0,0 +1,10 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3COMPATIBLE_MACHINE_chiefriver = "chiefriver"
4KMACHINE_chiefriver = "chiefriver"
5KBRANCH_chiefriver = "standard/common-pc-64/chiefriver"
6
7KERNEL_FEATURES_append_chiefriver = " features/amt/mei"
8
9SRCREV_machine_pn-linux-yocto_chiefriver ?= "6297e4c1d57e1063bfce297c2e12392348598559"
10SRCREV_meta_pn-linux-yocto_chiefriver ?= "c2b5ee363bf2612932301488f3ac0644ff70fc7c"