diff options
Diffstat (limited to 'meta/conf/machine/qemux86-64.conf')
-rw-r--r-- | meta/conf/machine/qemux86-64.conf | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 383e3bd6f3..14873a3b4f 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -6,11 +6,12 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/libgl ?= "mesa" PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" +PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" require conf/machine/include/qemu.inc DEFAULTTUNE ?= "core2-64" -require conf/machine/include/tune-core2.inc -require conf/machine/include/qemuboot-x86.inc +require conf/machine/include/x86/tune-x86-64-v3.inc +require conf/machine/include/x86/qemuboot-x86.inc UBOOT_MACHINE ?= "qemu-x86_64_defconfig" @@ -18,12 +19,16 @@ KERNEL_IMAGETYPE = "bzImage" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" +# Install swrast and glx if opengl is in DISTRO_FEATURES and x32 is not in use. +# This is because gallium swrast driver was found to crash X server on startup in qemu x32. XSERVER = "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \ + bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'mesa-driver-swrast xserver-xorg-extension-glx', d), '', d)} \ xf86-video-cirrus \ xf86-video-fbdev \ xf86-video-vmware \ xf86-video-modesetting \ + xf86-video-vesa \ xserver-xorg-module-libint10 \ " @@ -33,9 +38,8 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" -KERNEL_MODULE_AUTOLOAD += "uvesafb" -KERNEL_MODULE_PROBECONF += "uvesafb" -module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" - WKS_FILE ?= "qemux86-directdisk.wks" do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" + +#For runqemu +QB_SYSTEM_NAME = "qemu-system-x86_64" |