summaryrefslogtreecommitdiffstats
path: root/meta-yocto
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2012-08-17 11:24:19 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-22 14:26:10 +0100
commit19ff55a53b436d463f9577adaed15be77708f0d2 (patch)
tree946fb6bd70d8ae984fbd2d8dabe60ca66ddaecc2 /meta-yocto
parent25e926e5f6bbfb31d784e1f6a86bd77d4a3f7622 (diff)
downloadpoky-19ff55a53b436d463f9577adaed15be77708f0d2.tar.gz
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>
Diffstat (limited to 'meta-yocto')
-rw-r--r--meta-yocto/conf/machine/routerstationpro.conf2
-rw-r--r--meta-yocto/recipes-kernel/linux/linux-yocto_3.4.bbappend2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-yocto/conf/machine/routerstationpro.conf b/meta-yocto/conf/machine/routerstationpro.conf
index 3c2f56ff51..adf36a9ada 100644
--- a/meta-yocto/conf/machine/routerstationpro.conf
+++ b/meta-yocto/conf/machine/routerstationpro.conf
@@ -10,7 +10,7 @@ KERNEL_IMAGETYPE = "vmlinux"
10KERNEL_ALT_IMAGETYPE = "vmlinux.bin" 10KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
11 11
12PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 12PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
13PREFERRED_VERSION_linux-yocto ?= "3.0%" 13PREFERRED_VERSION_linux-yocto ?= "3.4%"
14PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" 14PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
15XSERVER = "xserver-kdrive-fbdev" 15XSERVER = "xserver-kdrive-fbdev"
16 16
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 534d826007..0a9508a1a2 100644
--- 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"
10 10
11 11
12COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" 12COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
13# COMPATIBLE_MACHINE_routerstationpro = "routerstationpro" 13COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
14# COMPATIBLE_MACHINE_beagleboard = "beagleboard" 14# COMPATIBLE_MACHINE_beagleboard = "beagleboard"
15COMPATIBLE_MACHINE_atom-pc = "atom-pc" 15COMPATIBLE_MACHINE_atom-pc = "atom-pc"