From 17c0128a48668c677ba612a06a42755e8f42e5b8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 5 Jun 2014 16:52:15 +0200 Subject: make mouse working in qemu x11 --- package/xf86-input-keyboard/Makefile | 2 +- package/xf86-input-mouse/Makefile | 2 +- target/config/Config.in.qemuopts | 3 +++ target/linux/config/Config.in.input | 4 ++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile index 30307e501..0bb1e1f10 100644 --- a/package/xf86-input-keyboard/Makefile +++ b/package/xf86-input-keyboard/Makefile @@ -16,7 +16,7 @@ PKG_SITES:= ${MASTER_SITE_XORG} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_ARCH_DEPENDS:= !m68k -PKG_CFLINE_XF86_INPUT_KEYBOARD:= depends on ADK_TARGET_WITH_INPUT +PKG_CFLINE_XF86_INPUT_KEYBOARD:= depends on ADK_TARGET_WITH_INPUT || ADK_TARGET_QEMU_WITH_GRAPHIC include $(TOPDIR)/mk/package.mk diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile index 19673b5fd..7897a6e29 100644 --- a/package/xf86-input-mouse/Makefile +++ b/package/xf86-input-mouse/Makefile @@ -16,7 +16,7 @@ PKG_SITES:= ${MASTER_SITE_XORG} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_ARCH_DEPENDS:= !m68k -PKG_CFLINE_XF86_INPUT_MOUSE:= depends on ADK_TARGET_WITH_INPUT +PKG_CFLINE_XF86_INPUT_MOUSE:= depends on ADK_TARGET_WITH_INPUT || ADK_TARGET_QEMU_WITH_GRAPHIC include $(TOPDIR)/mk/package.mk diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts index 266d4abb4..e93f4d4b6 100644 --- a/target/config/Config.in.qemuopts +++ b/target/config/Config.in.qemuopts @@ -67,9 +67,12 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC select ADK_KERNEL_FRAMEBUFFER_CONSOLE select ADK_KERNEL_INPUT select ADK_KERNEL_INPUT_KEYBOARD + select ADK_KERNEL_INPUT_MOUSE + select ADK_KERNEL_INPUT_MOUSEDEV select ADK_KERNEL_FB_SM501 if ADK_TARGET_SYSTEM_QEMU_SH4 select ADK_KERNEL_DRM_CIRRUS_QEMU 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_SH4 select ADK_KERNEL_USB_OHCI_HCD_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH4 diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 1f3bef093..50ee8eb6d 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -27,6 +27,10 @@ config ADK_KERNEL_KEYBOARD_ATARI default y if ADK_TARGET_SYSTEM_ARANYM_M68K default n +config ADK_KERNEL_MOUSE_PS2 + boolean + default n + config ADK_KERNEL_MOUSE_ATARI boolean default y if ADK_TARGET_SYSTEM_ARANYM_M68K -- cgit v1.2.3