Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

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

diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 44668357c77bded065beec5397ffd3fcc6d73acc..8e00390d4f4c69d975f92b83facfd1b1293a3dc4 100644 (file)
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -1 +1,18 @@
 # Default configuration for sh4-softmmu
+
+include pci.mak
+include usb.mak
+CONFIG_SERIAL=y
+CONFIG_PTIMER=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