qemu: allow to start X with modesetting driver

5 files changed, 16 insertions, 6 deletions

diff --git a/package/electron-bin/Makefile b/package/electron-bin/Makefile
index e1e31c91e..386d6cbd3 100644
--- a/package/electron-bin/Makefile
+++ b/package/electron-bin/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		build cross platform desktop apps
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		alsa-lib nss nspr expat pango cairo cups libxcursor
 PKG_DEPENDS+=		libdbus libatk glib libxtst libgtk2 gdk-pixbuf libxcomposite
-PKG_DEPENDS+=		libxscrnsaver gconf harfbuzz libpng
+PKG_DEPENDS+=		libxscrnsaver gconf harfbuzz libpng xinit
 PKG_URL:=		http://electron.atom.io
 PKG_SITES:=		https://github.com/electron/electron/releases/download/v$(PKG_VERSION)/
 
diff --git a/package/xf86-video-modesetting/Makefile b/package/xf86-video-modesetting/Makefile
index e8585d0cd..4cd733739 100644
--- a/package/xf86-video-modesetting/Makefile
+++ b/package/xf86-video-modesetting/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		7cb67bc95e83f195bc5f50b6af0b4ff66b5b9ccd16848613d55d732bc1e5fdb6
 PKG_DESCR:=		x11 driver for kms
 PKG_SECTION:=		x11/drivers
-PKG_DEPENDS:=		xorg-server
-PKG_BUILDDEP:=		xorg-server
+PKG_DEPENDS:=		xorg-server libudev
+PKG_BUILDDEP:=		xorg-server eudev
 PKG_NEEDS:=		c++
 PKG_SITES:=		http://www.x.org/releases/individual/driver/
 
diff --git a/package/xinit/Makefile b/package/xinit/Makefile
index cf65daeaf..a6f74d1e8 100644
--- a/package/xinit/Makefile
+++ b/package/xinit/Makefile
@@ -9,12 +9,14 @@ PKG_RELEASE:=		6
 PKG_HASH:=		3079d3fb86af99f4c2c2907b5725e5820fdb2144d3be6002ec367bfcebc5c480
 PKG_DESCR:=		x window system initializer
 PKG_SECTION:=		x11/utils
-PKG_DEPENDS:=		xorg-server mcookie xauth xset xterm
+PKG_DEPENDS:=		xorg-server mcookie xauth xset
 PKG_BUILDDEP:=		xorg-server
 PKG_NEEDS:=		c++
 PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/app/
 
+PKG_CFLINE_XINIT:=	select BUSYBOX_HEXDUMP
+
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(ADK_TOPDIR)/mk/package.mk
diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts
index 85856e906..505a648e8 100644
--- a/target/config/Config.in.qemuopts
+++ b/target/config/Config.in.qemuopts
@@ -3,7 +3,7 @@
 
 config ADK_QEMU_ARGS
 	string
-	default "" if ADK_TARGET_QEMU_WITH_GRAPHIC
+	default "-vga std" if ADK_TARGET_QEMU_WITH_GRAPHIC
 	default "" if ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
 	default "-nographic"
 
@@ -78,7 +78,7 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC
 	select ADK_KERNEL_INPUT_MOUSEDEV
 	select ADK_KERNEL_PLAT_VERSATILE_CLCD if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
 	select ADK_KERNEL_FB_SM501 if ADK_TARGET_SYSTEM_QEMU_SH
-	select ADK_KERNEL_DRM_CIRRUS_QEMU if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
+	select ADK_KERNEL_DRM_BOCHS if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
 	select ADK_KERNEL_KEYBOARD_ATKBD if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
 	select ADK_KERNEL_MOUSE_PS2 if ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
 	select ADK_KERNEL_USB_HID if ADK_TARGET_SYSTEM_QEMU_SH
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 3467feb46..e742ae9f0 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -275,6 +275,14 @@ config ADK_HARDWARE_GRAPHICS_INTEL_I915
 	help
           AGP/DRM/KMS support for Intel chipset i915.
 
+config ADK_KERNEL_DRM_BOCHS
+	bool "Support for QEMU STD VGA emulation (DRM/KMS)"
+	select ADK_KERNEL_DRM
+	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
+	depends on ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64
+	help
+	  DRM/KMS support for Qemu STD VGA emulation.
+
 config ADK_KERNEL_DRM_CIRRUS_QEMU
 	bool "Support for QEMU cirrus VGA emulation (DRM/KMS)"
 	select ADK_KERNEL_DRM