summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorMax Eliaser <max.eliaser@intel.com>2014-08-26 10:34:13 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-27 12:12:31 +0100
commit30c22a35d6be996ff607ea4c90d199eef80a47cd (patch)
treed745c82391e9aaedc60a8df3311bda570b7b8b79 /meta/conf/machine
parent0e8d6dedcd5995ee078c9c3f4a6d013e5a9f7a1f (diff)
downloadpoky-30c22a35d6be996ff607ea4c90d199eef80a47cd.tar.gz
qemux86-64: support X11 when QEMU is emulating a different GPU than vmware
QEMU is capable of emulating four different VGA adapters: cirrus, std, vmware, and QXL. By adding the cirrus and fbdev X.Org drivers to the qemux86-64 image, the image can be made to launch an X server on when cirrus and std are chosen, in addition to just vmware. (The build of QEMU in OE-Core appears to have QXL disabled, meaning a driver for it is unnecessary.) The runqemu script now allows the choice of emulated VGA adapter to be specified manually, so it's important that qemux86-64 supports any configuration the user might choose without requiring the image to be rebuilt. (From OE-Core rev: 1216de77a7f23fa10e34aee1ebe27fcc6a6589c0) Signed-off-by: Max Eliaser <max.eliaser@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/qemux86-64.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 642a2d9b52..837f9f4ab0 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -20,6 +20,8 @@ XSERVER = "xserver-xorg \
20 xf86-input-vmmouse \ 20 xf86-input-vmmouse \
21 xf86-input-keyboard \ 21 xf86-input-keyboard \
22 xf86-input-evdev \ 22 xf86-input-evdev \
23 xf86-video-cirrus \
24 xf86-video-fbdev \
23 xf86-video-vmware" 25 xf86-video-vmware"
24 26
25MACHINE_FEATURES += "x86" 27MACHINE_FEATURES += "x86"