routerstationpro: move board off 3.0 and onto the 3.4 kernel

The updated patch series to support this target is in place
on the BSP specific branch in the 3.4 kernel tree now[1], so
we can move it ahead off of the old 3.0 kernel.

[1] https://lists.yoctoproject.org/pipermail/linux-yocto/2012-July/000023.html

Cc: Bruce Ashfield <bruce.ashfield@windriver.com>
Cc: Saul Wold <sgw@linux.intel.com>
Acked-by: Darren Hart <dvhart@linux.intel.com>
(From meta-yocto rev: 68457a49a91a384347f2b0597d4da66bfd02a49e)

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta-yocto/conf/machine/routerstationpro.conf b/meta-yocto/conf/machine/routerstationpro.conf
index 3c2f56ff5117d22438db8931cf1f59630d135101..adf36a9ada441a04388aaa223002170cad1591d5 100644 (file)
--- a/meta-yocto/conf/machine/routerstationpro.conf
+++ b/meta-yocto/conf/machine/routerstationpro.conf
@@ -10,7 +10,7 @@ KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.0%"
+PREFERRED_VERSION_linux-yocto ?= "3.4%"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 XSERVER = "xserver-kdrive-fbdev"
 

diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 534d826007f15771db49d5684af8d5aa81cf9543..0a9508a1a237a151a74c3adcd2c79d63d1b5224f 100644 (file)
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -10,6 +10,6 @@ SRCREV_machine_beagleboard ?= "c77666c1d4c4be4be4b2046c3ff25bf1db34eb21"
 
 
 COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
-# COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
+COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
 # COMPATIBLE_MACHINE_beagleboard = "beagleboard"
 COMPATIBLE_MACHINE_atom-pc = "atom-pc"