aboutsummaryrefslogtreecommitdiff
path: root/default-configs
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-04-03 18:06:08 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2013-04-08 18:13:16 +0200
commite28bee8ee654b81f4688a505e56ade0692174b5c (patch)
tree10957fa9975ffda17a02c1001c10656044830892 /default-configs
parent914e29d28052dbe5a4f41b71eaf8c7bb19ac0929 (diff)
downloadqemu-arm-e28bee8ee654b81f4688a505e56ade0692174b5c.tar.gz
hw: move other devices to hw/misc/, configure with default-configs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'default-configs')
-rw-r--r--default-configs/arm-softmmu.mak4
-rw-r--r--default-configs/i386-softmmu.mak3
-rw-r--r--default-configs/sparc-softmmu.mak1
-rw-r--r--default-configs/x86_64-softmmu.mak3
4 files changed, 11 insertions, 0 deletions
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 93c7d95d4a..e03840ec56 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -58,6 +58,7 @@ CONFIG_BITBANG_I2C=y
CONFIG_FRAMEBUFFER=y
CONFIG_XILINX_SPIPS=y
+CONFIG_A9SCU=y
CONFIG_MARVELL_88W8618=y
CONFIG_OMAP=y
CONFIG_TSC210X=y
@@ -65,8 +66,11 @@ CONFIG_BLIZZARD=y
CONFIG_ONENAND=y
CONFIG_TUSB6010=y
CONFIG_IMX=y
+CONFIG_MAINSTONE=y
+CONFIG_NSERIES=y
CONFIG_REALVIEW=y
CONFIG_ZAURUS=y
+CONFIG_ZYNQ=y
CONFIG_VERSATILE_PCI=y
CONFIG_VERSATILE_I2C=y
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 79851bd52c..4ac0694470 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -38,6 +38,9 @@ CONFIG_WDT_IB700=y
CONFIG_PC_SYSFW=y
CONFIG_XEN_I386=$(CONFIG_XEN)
CONFIG_ISA_DEBUG=y
+CONFIG_ISA_TESTDEV=y
+CONFIG_VMPORT=y
+CONFIG_SGA=y
CONFIG_LPC_ICH9=y
CONFIG_Q35=y
CONFIG_APIC=y
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index 8c4d0a6886..8fc93dd643 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -14,4 +14,5 @@ CONFIG_SLAVIO=y
CONFIG_CS4231=y
CONFIG_GRLIB=y
CONFIG_STP2000=y
+CONFIG_ECCMEMCTL=y
CONFIG_SUN4M=y
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index 176f493ec4..bf4091c4dd 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -38,6 +38,9 @@ CONFIG_WDT_IB700=y
CONFIG_PC_SYSFW=y
CONFIG_XEN_I386=$(CONFIG_XEN)
CONFIG_ISA_DEBUG=y
+CONFIG_ISA_TESTDEV=y
+CONFIG_VMPORT=y
+CONFIG_SGA=y
CONFIG_LPC_ICH9=y
CONFIG_Q35=y
CONFIG_APIC=y