Merge branch 'spice.v23.pull' of git://anongit.freedesktop.org/spice/qemu

[qemu.git] / default-configs / mips64-softmmu.mak

diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
index c2d396d1388d2c97a23f19f405d0b7364e0b2cf8..aeab6b2c28c6c0697aa58e83dfe670b6244e5902 100644 (file)
--- a/default-configs/mips64-softmmu.mak
+++ b/default-configs/mips64-softmmu.mak
@@ -1,16 +1,28 @@
 # Default configuration for mips64-softmmu
 
+include pci.mak
 CONFIG_ISA_MMIO=y
 CONFIG_ESP=y
 CONFIG_VGA_PCI=y
 CONFIG_VGA_ISA=y
+CONFIG_VGA_ISA_MM=y
+CONFIG_VMWARE_VGA=y
+CONFIG_SERIAL=y
 CONFIG_PARALLEL=y
 CONFIG_I8254=y
 CONFIG_PCSPK=y
-CONFIG_USB_UHCI=y
+CONFIG_PCKBD=y
 CONFIG_FDC=y
-CONFIG_IDE_QDEV=y
-CONFIG_IDE_PCI=y
+CONFIG_ACPI=y
+CONFIG_APM=y
+CONFIG_DMA=y
+CONFIG_PIIX4=y
 CONFIG_IDE_ISA=y
 CONFIG_IDE_PIIX=y
 CONFIG_NE2000_ISA=y
+CONFIG_SOUND=y
+CONFIG_RC4030=y
+CONFIG_DP8393X=y
+CONFIG_DS1225Y=y
+CONFIG_MIPSNET=y
+CONFIG_PFLASH_CFI01=y