Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging

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

diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index 3e1ba930771d74105088ce62b644a58a22daf243..c2ae313f47336aaa5d5475df45f9f0dd90c7d863 100644 (file)
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -1,18 +1,15 @@
 # Default configuration for mips64el-softmmu
 
-CONFIG_ISA_MMIO=y
-CONFIG_ESP=y
-CONFIG_VGA_PCI=y
-CONFIG_VGA_ISA=y
-CONFIG_SERIAL=y
-CONFIG_PARALLEL=y
-CONFIG_I8254=y
-CONFIG_PCSPK=y
-CONFIG_USB_UHCI=y
-CONFIG_FDC=y
-CONFIG_IDE_QDEV=y
-CONFIG_IDE_PCI=y
-CONFIG_IDE_ISA=y
-CONFIG_IDE_PIIX=y
-CONFIG_NE2000_ISA=y
-CONFIG_SOUND=y
+include mips-softmmu-common.mak
+CONFIG_IDE_VIA=y
+CONFIG_RC4030=y
+CONFIG_DP8393X=y
+CONFIG_DS1225Y=y
+CONFIG_FULONG=y
+CONFIG_JAZZ=y
+CONFIG_G364FB=y
+CONFIG_JAZZ_LED=y
+CONFIG_VT82C686=y
+CONFIG_MIPS_BOSTON=y
+CONFIG_FITLOADER=y
+CONFIG_PCI_XILINX=y