Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20190404' into staging

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

diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
index c2d396d1388d2c97a23f19f405d0b7364e0b2cf8..bad74966724aa36dd93538c763f2f06c0f13c8ca 100644 (file)
--- a/default-configs/mips64-softmmu.mak
+++ b/default-configs/mips64-softmmu.mak
@@ -1,16 +1,9 @@
 # Default configuration for mips64-softmmu
 
-CONFIG_ISA_MMIO=y
-CONFIG_ESP=y
-CONFIG_VGA_PCI=y
-CONFIG_VGA_ISA=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
+include mips-softmmu-common.mak
+CONFIG_RC4030=y
+CONFIG_DP8393X=y
+CONFIG_DS1225Y=y
+CONFIG_JAZZ=y
+CONFIG_G364FB=y
+CONFIG_JAZZ_LED=y