From add666e2d8d220c034327040e4fe0602e17dd597 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Wed, 22 Feb 2012 11:29:12 -0600 Subject: meta-crownbay: switch to linux-yocto-3.2 kernel Switch crownbay and crownbay-noemgd to the 3.2 kernel. Signed-off-by: Tom Zanussi --- meta-crownbay/conf/machine/crownbay-noemgd.conf | 2 ++ meta-crownbay/conf/machine/crownbay.conf | 2 ++ .../recipes-kernel/linux/linux-yocto-rt_3.2.bbappend | 20 ++++++++++++++++++++ .../recipes-kernel/linux/linux-yocto_3.2.bbappend | 17 +++++++++++++++++ 4 files changed, 41 insertions(+) create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_3.2.bbappend diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf index 2c80bd8d..af85b007 100644 --- a/meta-crownbay/conf/machine/crownbay-noemgd.conf +++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf @@ -4,6 +4,8 @@ #@DESCRIPTION: Machine configuration for Crown Bay systems, without Intel-proprietary graphics bits # i.e. 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-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf index 2c1ef3d5..1458bff2 100644 --- a/meta-crownbay/conf/machine/crownbay.conf +++ b/meta-crownbay/conf/machine/crownbay.conf @@ -4,6 +4,8 @@ #@DESCRIPTION: Machine configuration for Crown Bay systems # i.e. 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-crownbay/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend new file mode 100644 index 00000000..dee9bce4 --- /dev/null +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend @@ -0,0 +1,20 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" +KMACHINE_crownbay-noemgd = "crownbay" + +KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc" + +COMPATIBLE_MACHINE_crownbay = "crownbay" +KMACHINE_crownbay = "crownbay" + +KERNEL_FEATURES_append_crownbay += " cfg/smp.scc" + +# Update the following to use a different BSP branch or meta SRCREV +#KBRANCH_crownbay-noemgd = "yocto/standard/preempt-rt/base" +#SRCREV_machine_pn-linux-yocto-rt_crownbay-noemgd ?= XXXX +#SRCREV_meta_pn-linux-yocto-rt_crownbay-noemgd ?= XXXX + +#KBRANCH_crownbay = "yocto/standard/preempt-rt/base" +#SRCREV_machine_pn-linux-yocto-rt_crownbay ?= XXXX +#SRCREV_meta_pn-linux-yocto-rt_crownbay ?= XXXX diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.2.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.2.bbappend new file mode 100644 index 00000000..a3075b4b --- /dev/null +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.2.bbappend @@ -0,0 +1,17 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +COMPATIBLE_MACHINE_crownbay = "crownbay" +KMACHINE_crownbay = "crownbay" +KBRANCH_crownbay = "standard/default/crownbay" +KERNEL_FEATURES_append_crownbay += " cfg/smp.scc" + +COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" +KMACHINE_crownbay-noemgd = "crownbay" +KBRANCH_crownbay-noemgd = "standard/default/crownbay" +KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc" + +SRCREV_machine_pn-linux-yocto_crownbay ?= "211fc7f4d10ec2b82b424286aabbaff9254b7cbd" +SRCREV_meta_pn-linux-yocto_crownbay ?= "514847185c78c07f52e02750fbe0a03ca3a31d8f" + +SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "211fc7f4d10ec2b82b424286aabbaff9254b7cbd" +SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "514847185c78c07f52e02750fbe0a03ca3a31d8f" -- cgit v1.2.3-54-g00ecf