summaryrefslogtreecommitdiff
path: root/target/config/Config.in
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-17 10:25:17 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-17 10:25:17 +0100
commit0e68cef8aa8ac52e73a393de4fbb348ecdaaffb5 (patch)
treeb599f31ff8515d31146aa2df8389c53fd77a560a /target/config/Config.in
parentc0e617ea5633e5879f4b7dcf00f7942cf5da6a83 (diff)
parent6c26b8016dda0c391a3a513c46998e16ce09cc4d (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/config/Config.in')
-rw-r--r--target/config/Config.in11
1 files changed, 6 insertions, 5 deletions
diff --git a/target/config/Config.in b/target/config/Config.in
index ee6aaa695..1baa25317 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -251,7 +251,6 @@ config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
select ADK_soft_float
select ADK_eabi
select ADK_CPU_XSCALE
- select ADK_TARGET_WITH_VGA
depends on ADK_TARGET_SYSTEM_QEMU_ARM
endchoice
@@ -304,7 +303,12 @@ endchoice
choice
prompt "Qemu Emulation using VirtIO drivers"
-depends on ADK_TARGET_SYSTEM_QEMU_SPARC64
+depends on ADK_TARGET_SYSTEM_QEMU_SPARC64 || \
+ ADK_TARGET_SYSTEM_QEMU_I686 || \
+ ADK_TARGET_SYSTEM_QEMU_X86_64
+
+config ADK_TARGET_QEMU_WITHOUT_VIRTIO
+ boolean "disabled"
config ADK_TARGET_QEMU_WITH_VIRTIO
boolean "enabled"
@@ -314,9 +318,6 @@ config ADK_TARGET_QEMU_WITH_VIRTIO
select ADK_KERNEL_VIRTIO_NET
select ADK_KERNEL_VIRTIO_BLK
-config ADK_TARGET_QEMU_WITHOUT_VIRTIO
- boolean "disabled"
-
endchoice