meta-fishriver: switch to linux-yocto-3.2 kernel

Switch fishriver to the 3.2 kernel.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>

3 files changed, 19 insertions, 0 deletions

diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
index aa066dbb..289e41d4 100644
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ b/meta-fishriver/conf/machine/fishriver.conf
@@ -4,6 +4,8 @@
 #@DESCRIPTION: Machine configuration for Fish River Island systems
 # i.e. Z530/E660 + EG20T
 
+PREFERRED_VERSION_linux-yocto ?= "3.2%"
+
 require conf/machine/include/tune-atom.inc
 require conf/machine/include/ia32-base.inc
 
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
new file mode 100644
index 00000000..a91a4259
--- /dev/null
+++ b/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_fishriver = "fishriver"
+KMACHINE_fishriver  = "fishriver"
+
+# Update the following to use a different BSP branch or meta SRCREV
+#KBRANCH_fishriver  = "standard/preempt-rt/base"
+#SRCREV_machine_pn-linux-yocto-rt_fishriver ?= XXXX
+#SRCREV_meta_pn-linux-yocto-rt_fishriver ?= XXXX
diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend
new file mode 100644
index 00000000..0d074b7f
--- /dev/null
+++ b/meta-fishriver/recipes-kernel/linux/linux-yocto_3.2.bbappend
@@ -0,0 +1,9 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+COMPATIBLE_MACHINE_fishriver = "fishriver"
+KMACHINE_fishriver  = "fishriver"
+KBRANCH_fishriver  = "standard/default/fishriver"
+KERNEL_FEATURES_append_fishriver += " cfg/smp.scc"
+
+SRCREV_machine_pn-linux-yocto_fishriver ?= "4f08c069762fa475e773b02f11635a3a173bdca5"
+SRCREV_meta_pn-linux-yocto_fishriver ?= "514847185c78c07f52e02750fbe0a03ca3a31d8f"