4 files changed, 19 insertions, 45 deletions

diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
deleted file mode 100644
index 274eb822ce..0000000000
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
+++ /dev/null
@@ -1,25 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-# atom-pc support
-COMPATIBLE_MACHINE_atom-pc = "atom-pc"
-KMACHINE_atom-pc = "atom-pc"
-KBRANCH_atom-pc = "yocto/standard/preempt-rt/base"
-SRCREV_machine_pn-linux-yocto-rt_atom-pc = "bbd5bfe49403fdcca294ca4b163d5f7195ea3a8e"
-
-# mpc8315e-rdb support
-COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
-KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb"
-KBRANCH_mpc8315e-rdb = "yocto/standard/preempt-rt/base"
-SRCREV_machine_pn-linux-yocto-rt_mpc8315e-rdb = "bbd5bfe49403fdcca294ca4b163d5f7195ea3a8e"
-
-# beagleboard support - 3.0 support has not yet been completed, build failure
-#COMPATIBLE_MACHINE_beagleboard = "beagleboard"
-#KMACHINE_beagleboard = "beagleboard"
-#KBRANCH_beagleboard = "yocto/standard/preempt-rt/base"
-#SRCREV_machine_pn-linux-yocto-rt_beagleboard = 
-
-# routerstationpro support - preempt-rt kernel build failure
-COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
-KMACHINE_routerstationpro = "routerstationpro"
-KBRANCH_routerstationpro = "yocto/standard/preempt-rt/routerstationpro"
-SRCREV_machine_pn-linux-yocto-rt_routerstationpro = "634ba79510753eecd27a39a315f690f1c9d46efe"
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.0.bbappend
deleted file mode 100644
index 9641336cf6..0000000000
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-KBRANCH_atom-pc  = "yocto/standard/common-pc/atom-pc"
-KBRANCH_routerstationpro = "yocto/standard/routerstationpro"
-KBRANCH_mpc8315e-rdb = "yocto/standard/fsl-mpc8315e-rdb"
-KBRANCH_beagleboard = "yocto/standard/beagleboard"
-
-SRCREV_machine_atom-pc ?= "834c2a69c87ee7211932f8ec5102a472828abcb1"
-SRCREV_machine_routerstationpro ?= "1c17c082b6ee565acc176cde5be835ac4269817b"
-SRCREV_machine_mpc8315e-rdb ?= "f2312437b52dda4499310aacb4c561ba8b8cbeb7"
-SRCREV_machine_beagleboard ?= "3ab688a78cac7b2e32afc83376a53370f2bd13b7"
-
-
-COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
-COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
-COMPATIBLE_MACHINE_beagleboard = "beagleboard"
-COMPATIBLE_MACHINE_atom-pc = "atom-pc"
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
new file mode 100644
index 0000000000..479a3860b7
--- /dev/null
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -0,0 +1,14 @@
+KBRANCH_atom-pc  = "standard/common-pc/atom-pc"
+KBRANCH_routerstationpro = "standard/routerstationpro"
+KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
+KBRANCH_beagleboard = "standard/beagleboard"
+
+#SRCREV_machine_atom-pc ?= "b170394a475b96ecc92cbc9e4b002bed0a9f69c5"
+#SRCREV_machine_routerstationpro ?= "b170394a475b96ecc92cbc9e4b002bed0a9f69c5"
+#SRCREV_machine_mpc8315e-rdb ?= "82bb8c34e0eb5e3d3b35d3c5631d9df147b659dd"
+#SRCREV_machine_beagleboard ?= "b170394a475b96ecc92cbc9e4b002bed0a9f69c5"
+
+COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
+COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
+COMPATIBLE_MACHINE_beagleboard = "beagleboard"
+COMPATIBLE_MACHINE_atom-pc = "atom-pc"
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index d924fcc996..85829f9055 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -14,11 +14,11 @@ LAYER_CONF_VERSION ?= "6"
 DISTRO_FEATURES_append = " largefile opengl multiarch"
 
 PREFERRED_VERSION_linux-yocto ?= "3.4%"
-PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.4%"
-PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.4%"
-PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.4%"
-PREFERRED_VERSION_linux-yocto_qemumips ?= "3.4%"
-PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.4%"
+PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.8%"
+PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.8%"
+PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.8%"
+PREFERRED_VERSION_linux-yocto_qemumips ?= "3.8%"
+PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.8%"
 
 SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
 SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"