fix disk support in qemu-x86, minor other cleanups

target/config/Config.in.qemuopts

@@ -1,13 +1,13 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
+menu "Qemu configuration"
+depends on ADK_TARGET_QEMU
+
 config ADK_QEMU_ARGS
 	string
 	default "-nographic" if ADK_TARGET_QEMU_WITHOUT_GRAPHIC
 
-menu "Qemu configuration"
-depends on ADK_TARGET_QEMU
-
 choice 
 prompt "Use a Bootloader"
 depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86
@@ -45,7 +45,7 @@ endchoice
 
 choice
 prompt "Qemu Emulation with graphical output"
-depends on ADK_TARGET_QEMU
+depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86 || ADK_TARGET_QEMU_ARM_MODEL_SPITZ || ADK_TARGET_SYSTEM_QEMU_SH4
 default ADK_TARGET_QEMU_WITH_GRAPHIC if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 
 config ADK_TARGET_QEMU_WITHOUT_GRAPHIC

target/linux/config/Config.in.block

@@ -164,7 +164,7 @@ config ADK_KERNEL_ATA_PIIX
 	select ADK_KERNEL_ATA_BMDMA
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
-	depends on ADK_TARGET_SYSTEM_IBM_X40
+	depends on ADK_TARGET_SYSTEM_IBM_X40 || ADK_TARGET_QEMU
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default n
 	help
@@ -190,7 +190,7 @@ config ADK_KERNEL_PATA_PLATFORM
 	select ADK_KERNEL_ATA_BMDMA
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
-	depends on ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB
+	depends on ADK_TARGET_SYSTEM_QEMU_SH4
 	default n
 
 config ADK_KERNEL_PATA_PCMCIA
@@ -322,7 +322,6 @@ endmenu
 
 menu "Block driver support"
 
-
 config ADK_KERNEL_SCSI
 	prompt "SCSI support"
 	tristate
@@ -438,6 +437,8 @@ config ADK_KERNEL_BLK_DEV_DRBD
 	tristate
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_CONNECTOR
+	default m if ADK_PACKAGE_DRBD
+	default n
 	help
           DRBD - http://www.drbd.org