summaryrefslogtreecommitdiff
path: root/target/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2014-08-24 09:47:37 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2014-08-24 09:47:37 +0200
commit234c0a1cbeeba944a06caf0cf3b55d2f6921f584 (patch)
tree67fa5847f4d40621371625aa6825d61ff0061844 /target/config
parent3aec213337c8e2d68cf0f3dd5474562abcca8da2 (diff)
parent07d73ebe33e5c3edf1ae2974d02931401c740588 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/config')
-rw-r--r--target/config/Config.in.qemuopts6
1 files changed, 2 insertions, 4 deletions
diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts
index a302bedab..55ea6bcbb 100644
--- a/target/config/Config.in.qemuopts
+++ b/target/config/Config.in.qemuopts
@@ -29,7 +29,7 @@ endchoice
choice
prompt "Qemu Emulation with storage device"
-depends on ADK_TARGET_QEMU && !ADK_TARGET_SYSTEM_QEMU_XTENSA
+depends on ADK_TARGET_QEMU && !ADK_TARGET_SYSTEM_QEMU_XTENSA && !ADK_TARGET_SYSTEM_QEMU_AARCH64
default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_ARCHIVE
default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_SQUASHFS
default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_JFFS2
@@ -45,6 +45,7 @@ config ADK_TARGET_QEMU_WITH_BLOCK
select ADK_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC
select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64
select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC
+ select ADK_KERNEL_PATA_CMD64X if ADK_TARGET_SYSTEM_QEMU_SPARC64
select ADK_KERNEL_PATA_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH
select ADK_KERNEL_PATA_PXA if ADK_TARGET_QEMU_ARM_MODEL_SPITZ || ADK_TARGET_QEMU_ARM_MODEL_TERRIER
@@ -84,7 +85,6 @@ depends on ADK_TARGET_SYSTEM_QEMU_SPARC64 || \
ADK_TARGET_SYSTEM_QEMU_AARCH64 || \
ADK_TARGET_SYSTEM_QEMU_X86 || \
ADK_TARGET_SYSTEM_QEMU_X86_64
-default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_SPARC64
default ADK_TARGET_QEMU_WITH_VIRTIO if ADK_TARGET_SYSTEM_QEMU_AARCH64
config ADK_TARGET_QEMU_WITHOUT_VIRTIO
@@ -110,6 +110,4 @@ config ADK_TARGET_QEMU_WITH_AUDIO
boolean "enabled"
endchoice
-
-
endmenu