summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target/linux/config/Config.in.virtio19
-rw-r--r--target/sparc64/Makefile2
2 files changed, 12 insertions, 9 deletions
diff --git a/target/linux/config/Config.in.virtio b/target/linux/config/Config.in.virtio
index 58ff339a9..1012a69b4 100644
--- a/target/linux/config/Config.in.virtio
+++ b/target/linux/config/Config.in.virtio
@@ -1,32 +1,35 @@
menu "Virtio driver support"
config ADK_KERNEL_VIRTIO
- boolean
+ bool
config ADK_KERNEL_VIRTIO_CONSOLE
- boolean
+ bool
+
+config ADK_KERNEL_VIRTIO_PCI_LEGACY
+ bool
config ADK_KERNEL_VIRTIO_PCI
- boolean
+ bool
config ADK_KERNEL_VIRTIO_MMIO
- boolean
+ bool
config ADK_KERNEL_VIRTIO_NET
- prompt "Virtio net driver"
- tristate
+ tristate "Virtio net driver"
select ADK_KERNEL_VIRTIO
select ADK_KERNEL_VIRTIO_MMIO
select ADK_KERNEL_VIRTIO_PCI
+ select ADK_KERNEL_VIRTIO_PCI_LEGACY
default n
help
Enables support for Virtio Net driver.
config ADK_KERNEL_VIRTIO_BLK
- prompt "Virtio block driver"
- tristate
+ tristate "Virtio block driver"
select ADK_KERNEL_VIRTIO
select ADK_KERNEL_VIRTIO_PCI
+ select ADK_KERNEL_VIRTIO_PCI_LEGACY
select ADK_KERNEL_VIRTIO_MMIO
select ADK_KERNEL_BLK_DEV
default n
diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile
index 1c0aa5f49..0b7754d46 100644
--- a/target/sparc64/Makefile
+++ b/target/sparc64/Makefile
@@ -14,7 +14,7 @@ QEMU_ARGS+=${ADK_QEMU_ARGS}
ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
QEMU_ARGS+=-net nic,model=virtio -net user
ifeq ($(ADK_TARGET_FS),archive)
-QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio,index=0
+QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio
endif
endif