summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorMax Eliaser <max.eliaser@intel.com>2014-08-26 10:34:11 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-27 12:12:30 +0100
commit9e8666c91f8e1ce677bbab0cd23a148fad802536 (patch)
treecd921a2f887a2c2189e01c11123b5fbfe6ecd671 /meta/conf/machine
parentae54f2b2aa848d38b0bda59c28ab4f4a6cb10eec (diff)
downloadpoky-9e8666c91f8e1ce677bbab0cd23a148fad802536.tar.gz
qemux86: 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 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 supports any configuration the user might choose without requiring the image to be rebuilt. (From OE-Core rev: 9e4ca6739d65716fcb0a1b7d635749083da98c52) 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.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index ebc27dba47..3562276932 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -19,6 +19,8 @@ XSERVER = "xserver-xorg \
19 xf86-input-vmmouse \ 19 xf86-input-vmmouse \
20 xf86-input-keyboard \ 20 xf86-input-keyboard \
21 xf86-input-evdev \ 21 xf86-input-evdev \
22 xf86-video-cirrus \
23 xf86-video-fbdev \
22 xf86-video-vmware" 24 xf86-video-vmware"
23 25
24MACHINE_FEATURES += "x86" 26MACHINE_FEATURES += "x86"