summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-05-27 14:11:20 -0700
committerSaul Wold <sgw@linux.intel.com>2011-05-27 15:30:19 -0700
commit4ff7af11ef69849ef9c16f585eae58ac920b222b (patch)
treea3945ce1f51d1469bfa44ca56f32356c2d94158a
parent4c99fb5ec6dc831b2c72c42897a4f4788290be7c (diff)
downloadpoky-4ff7af11ef69849ef9c16f585eae58ac920b222b.tar.gz
machine confs: Add xserver-kdrive as PREFERRED_PROVIDER1.1_M1.rc2
Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta-yocto/conf/machine/mpc8315e-rdb.conf3
-rw-r--r--meta-yocto/conf/machine/routerstationpro.conf3
2 files changed, 6 insertions, 0 deletions
diff --git a/meta-yocto/conf/machine/mpc8315e-rdb.conf b/meta-yocto/conf/machine/mpc8315e-rdb.conf
index 34b75bbc8a..095d113f2c 100644
--- a/meta-yocto/conf/machine/mpc8315e-rdb.conf
+++ b/meta-yocto/conf/machine/mpc8315e-rdb.conf
@@ -14,6 +14,9 @@ MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
14 14
15PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" 15PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
16#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 16#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
17PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
18XSERVER = "xserver-kdrive-fbdev"
19
17 20
18UBOOT_ENTRYPOINT = "0x00000000" 21UBOOT_ENTRYPOINT = "0x00000000"
19 22
diff --git a/meta-yocto/conf/machine/routerstationpro.conf b/meta-yocto/conf/machine/routerstationpro.conf
index d464842134..b50f1a82fa 100644
--- a/meta-yocto/conf/machine/routerstationpro.conf
+++ b/meta-yocto/conf/machine/routerstationpro.conf
@@ -14,6 +14,9 @@ KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
14 14
15PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" 15PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
16#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 16#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
17PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
18XSERVER = "xserver-kdrive-fbdev"
19
17 20
18SERIAL_CONSOLE = "115200 ttyS0" 21SERIAL_CONSOLE = "115200 ttyS0"
19 22