summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-12-22 13:12:18 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 21:30:49 +0000
commit9e993225272cf05ed03bce4baad8436de3b64621 (patch)
treee62e37dfc619d3ebf1b34e32b159bd695c59143c
parentf3a1a8897c78e116d7d28947a85687d0ce9d7df7 (diff)
downloadpoky-9e993225272cf05ed03bce4baad8436de3b64621.tar.gz
linux-yocto/meta-yocto: routerstationpro/beagleboard: add 3.0.x support
Updating the routerstationpro and beagleboard compatibility and SRCREV to pickup v3.0.12 support. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-yocto/conf/machine/beagleboard.conf1
-rw-r--r--meta-yocto/conf/machine/routerstationpro.conf1
-rw-r--r--meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend8
3 files changed, 6 insertions, 4 deletions
diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
index 4d21388e07..dd549d0ba3 100644
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ b/meta-yocto/conf/machine/beagleboard.conf
@@ -32,6 +32,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
32SERIAL_CONSOLE = "115200 ttyO2" 32SERIAL_CONSOLE = "115200 ttyO2"
33 33
34PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 34PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
35PREFERRED_VERSION_linux-yocto ?= "3.0%"
35 36
36KERNEL_IMAGETYPE = "uImage" 37KERNEL_IMAGETYPE = "uImage"
37 38
diff --git a/meta-yocto/conf/machine/routerstationpro.conf b/meta-yocto/conf/machine/routerstationpro.conf
index 9338ca1062..83c2f8ab05 100644
--- a/meta-yocto/conf/machine/routerstationpro.conf
+++ b/meta-yocto/conf/machine/routerstationpro.conf
@@ -11,6 +11,7 @@ KERNEL_IMAGETYPE = "vmlinux"
11KERNEL_ALT_IMAGETYPE = "vmlinux.bin" 11KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
12 12
13PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 13PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
14PREFERRED_VERSION_linux-yocto ?= "3.0%"
14PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" 15PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
15XSERVER = "xserver-kdrive-fbdev" 16XSERVER = "xserver-kdrive-fbdev"
16 17
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
index 4f68bc1ba4..e51088009a 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -5,11 +5,11 @@ KMACHINE_beagleboard = "yocto/standard/beagleboard"
5 5
6 6
7SRCREV_machine_atom-pc ?= "1e18e44adbe79b846e382370eb29bc4b8cd5a1a0" 7SRCREV_machine_atom-pc ?= "1e18e44adbe79b846e382370eb29bc4b8cd5a1a0"
8SRCREV_machine_routerstationpro ?= "ed0e03a8b04388a982141919da805392b7ca1c91" 8SRCREV_machine_routerstationpro ?= "8f38705810634a84326d3a3ebe9653951aa4bf61"
9SRCREV_machine_mpc8315e-rdb ?= "58ffdb8000e34d2ba7c3ef278b26680b0886e8b5" 9SRCREV_machine_mpc8315e-rdb ?= "58ffdb8000e34d2ba7c3ef278b26680b0886e8b5"
10SRCREV_machine_beagleboard ?= "2bba211297d10047637b8f49abd2c5415480ce4d" 10SRCREV_machine_beagleboard ?= "6b4bf6173b0bd2d1619a8218bac66ebc4681dd35"
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" 14COMPATIBLE_MACHINE_beagleboard = "beagleboard"
15COMPATIBLE_MACHINE_atom-pc = "atom-pc" 15COMPATIBLE_MACHINE_atom-pc = "atom-pc"