Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

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

diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
index b9a342dada88f44077a91236b7a1c4a5fa50e84f..0510bb6a5336b73fa54d7ec189a71c701ec0f525 100644 (file)
--- a/default-configs/mips64-softmmu.mak
+++ b/default-configs/mips64-softmmu.mak
@@ -1,17 +1,33 @@
 # Default configuration for mips64-softmmu
 
+include pci.mak
 CONFIG_ISA_MMIO=y
 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
 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
+CONFIG_G364FB=y
+CONFIG_I8259=y
+CONFIG_JAZZ_LED=y