Merge branch 'pci' into for_anthony

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

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index f68273d57eea21126e480dcae976499f53296d1c..e7a4e84481628bdfb9433a53a27e91c0af8c1f30 100644 (file)
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -5,8 +5,10 @@ CONFIG_USB_OHCI=y
 CONFIG_ISA_MMIO=y
 CONFIG_NAND=y
 CONFIG_ECC=y
+CONFIG_SERIAL=y
 CONFIG_PTIMER=y
 CONFIG_SD=y
+CONFIG_IDE_CORE=y
 CONFIG_MAX7310=y
 CONFIG_WM8750=y
 CONFIG_TWL92230=y
@@ -14,6 +16,15 @@ CONFIG_TSC2005=y
 CONFIG_LM832X=y
 CONFIG_TMP105=y
 CONFIG_STELLARIS_INPUT=y
-CONFIG_SD0303=y
-CONFIG_SD0323=y
+CONFIG_SSD0303=y
+CONFIG_SSD0323=y
 CONFIG_ADS7846=y
+CONFIG_MAX111X=y
+CONFIG_SSI=y
+CONFIG_SSI_SD=y
+CONFIG_LAN9118=y
+CONFIG_SMC91C111=y
+CONFIG_DS1338=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_PFLASH_CFI01=y
+CONFIG_PFLASH_CFI02=y