Merge branch 'master' of git+ssh://openadk.org/git/openadk

target/linux/config/Config.in.graphics

@@ -48,6 +48,17 @@ config ADK_KERNEL_AGP_INTEL
 menu "Graphic devices support"
 depends on ADK_TARGET_WITH_VGA
 
+config ADK_KERNEL_FB_CIRRUS
+	prompt "................................ Framebuffer support for QEMU Emulator"
+	tristate
+	select ADK_KERNEL_FB
+	select ADK_KERNEL_FRAMEBUFFER_CONSOLE
+	default y if ADK_TARGET_SYSTEM_QEMU_I686
+ 	default n
+	depends on ADK_TARGET_SYSTEM_QEMU_I686
+ 	help
+	 Framebuffer support for Qemu Emulator.
+
 config ADK_KERNEL_FB_GEODE_LX
 	prompt "................................ Framebuffer support for ALIX boards with VGA"
 	tristate

target/linux/config/Config.in.input

@@ -3,6 +3,7 @@ depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT
 
 config ADK_KERNEL_INPUT
 	boolean
+	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
@@ -14,6 +15,7 @@ config ADK_KERNEL_INPUT
 
 config ADK_KERNEL_INPUT_KEYBOARD
 	boolean
+	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
@@ -25,6 +27,7 @@ config ADK_KERNEL_INPUT_KEYBOARD
 
 config ADK_KERNEL_KEYBOARD_ATKBD
 	boolean
+	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
@@ -36,6 +39,7 @@ config ADK_KERNEL_KEYBOARD_ATKBD
 
 config ADK_KERNEL_INPUT_MOUSE
 	boolean
+	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
@@ -47,6 +51,7 @@ config ADK_KERNEL_INPUT_MOUSE
 
 config ADK_KERNEL_INPUT_MOUSEDEV
 	boolean
+	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40