summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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"