Merge remote-tracking branch 'luiz/queue/qmp' into staging

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

diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
index 94a34862dcdb90f9b2cda803c134611a97929198..71177efdffdc233aba1aa15ad9cfdcab9584e4b5 100644 (file)
--- a/default-configs/mips-softmmu.mak
+++ b/default-configs/mips-softmmu.mak
@@ -1,11 +1,14 @@
 # Default configuration for mips-softmmu
 
 include pci.mak
-CONFIG_ISA_MMIO=y
+include sound.mak
+include usb.mak
 CONFIG_ESP=y
+CONFIG_VGA=y
 CONFIG_VGA_PCI=y
 CONFIG_VGA_ISA=y
 CONFIG_VGA_ISA_MM=y
+CONFIG_VGA_CIRRUS=y
 CONFIG_VMWARE_VGA=y
 CONFIG_SERIAL=y
 CONFIG_PARALLEL=y
@@ -15,12 +18,11 @@ CONFIG_PCKBD=y
 CONFIG_FDC=y
 CONFIG_ACPI=y
 CONFIG_APM=y
-CONFIG_DMA=y
+CONFIG_I8257=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
@@ -28,3 +30,8 @@ CONFIG_MIPSNET=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_G364FB=y
 CONFIG_I8259=y
+CONFIG_JAZZ_LED=y
+CONFIG_MC146818RTC=y
+CONFIG_VT82C686=y
+CONFIG_ISA_TESTDEV=y
+CONFIG_EMPTY_SLOT=y