Merge remote-tracking branch 'remotes/kraxel/tags/usb-20190529-pull-request' into...

[mirror_qemu.git] / default-configs / riscv32-softmmu.mak

diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak
index c9c59714093f3c989795667ea902929318b3c0e7..1ae077ed877e64057b676afbbb20fe0c187f8f1c 100644 (file)
--- a/default-configs/riscv32-softmmu.mak
+++ b/default-configs/riscv32-softmmu.mak
@@ -1,14 +1,12 @@
-# Default configuration for riscv-softmmu
-
-include pci.mak
-include usb.mak
-
-CONFIG_SERIAL=y
-CONFIG_VIRTIO_MMIO=y
-
-CONFIG_CADENCE=y
-
-CONFIG_PCI_GENERIC=y
-
-CONFIG_VGA=y
-CONFIG_VGA_PCI=y
+# Default configuration for riscv32-softmmu
+
+# Uncomment the following lines to disable these optional devices:
+#
+#CONFIG_PCI_DEVICES=n
+
+# Boards:
+#
+CONFIG_SPIKE=y
+CONFIG_SIFIVE_E=y
+CONFIG_SIFIVE_U=y
+CONFIG_RISCV_VIRT=y