diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 12:59:04 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:13 +0200 |
| commit | fc97bb5ba3e7239c0b6d24095df6784868dfebbf (patch) | |
| tree | 6367fc217473184292a7eeee38c1b8e6a0db1573 /default-configs | |
| parent | 34b8f63ea1aa0941f11c6c032f8e1716269a0449 (diff) | |
hw: move display devices to hw/display/, configure via default-configs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'default-configs')
| -rw-r--r-- | default-configs/arm-softmmu.mak | 6 | ||||
| -rw-r--r-- | default-configs/i386-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/lm32-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/sh4-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/sh4eb-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/sparc-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/x86_64-softmmu.mak | 1 |
7 files changed, 12 insertions, 0 deletions
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index c0e011084b..a7dd44a432 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -48,8 +48,14 @@ CONFIG_PL310=y CONFIG_PL330=y CONFIG_CADENCE=y CONFIG_XGMAC=y +CONFIG_EXYNOS4=y +CONFIG_PXA2XX=y +CONFIG_FRAMEBUFFER=y CONFIG_MARVELL_88W8618=y +CONFIG_OMAP=y +CONFIG_BLIZZARD=y CONFIG_ONENAND=y +CONFIG_ZAURUS=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 4f0b3f346f..48ed8d4413 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -3,6 +3,7 @@ include pci.mak include usb.mak CONFIG_VGA=y +CONFIG_QXL=$(CONFIG_SPICE) CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y CONFIG_VGA_CIRRUS=y diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmmu.mak index 2654ad6e44..6b2ee430e5 100644 --- a/default-configs/lm32-softmmu.mak +++ b/default-configs/lm32-softmmu.mak @@ -1,6 +1,7 @@ # Default configuration for lm32-softmmu CONFIG_MILKYMIST=y +CONFIG_FRAMEBUFFER=y CONFIG_PTIMER=y CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI02=y diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak index 20a05f9f35..f6bf62d1c2 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -8,3 +8,4 @@ CONFIG_PFLASH_CFI02=y CONFIG_ISA_MMIO=y CONFIG_SH4=y CONFIG_IDE_MMIO=y +CONFIG_SM501=y diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak index 875e7e62c2..c1d513d099 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -8,3 +8,4 @@ CONFIG_PFLASH_CFI02=y CONFIG_ISA_MMIO=y CONFIG_SH4=y CONFIG_IDE_MMIO=y +CONFIG_SM501=y diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak index eda8797662..25bcbe38bc 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -9,4 +9,5 @@ CONFIG_FDC=y CONFIG_EMPTY_SLOT=y CONFIG_PCNET_COMMON=y CONFIG_LANCE=y +CONFIG_TCX=y CONFIG_CS4231=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 6fba70ff73..58b33cfa24 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -3,6 +3,7 @@ include pci.mak include usb.mak CONFIG_VGA=y +CONFIG_QXL=$(CONFIG_SPICE) CONFIG_VGA_PCI=y CONFIG_VGA_ISA=y CONFIG_VGA_CIRRUS=y |