Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20161004' into...

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

diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 7c0d3288e37326bcb2410b4a83092c57cc3a3b24..8e00390d4f4c69d975f92b83facfd1b1293a3dc4 100644 (file)
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -1,8 +1,18 @@
 # Default configuration for sh4-softmmu
 
-CONFIG_USB_OHCI=y
+include pci.mak
+include usb.mak
 CONFIG_SERIAL=y
 CONFIG_PTIMER=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_IDE_CORE=y
 CONFIG_PFLASH_CFI02=y
+CONFIG_SH4=y
+CONFIG_IDE_MMIO=y
+CONFIG_SM501=y
+CONFIG_ISA_TESTDEV=y
+CONFIG_I82378=y
+CONFIG_I8259=y
+CONFIG_I8254=y
+CONFIG_PCSPK=y
+CONFIG_I82374=y
+CONFIG_I8257=y
+CONFIG_MC146818RTC=y