diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 14:38:25 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:14 +0200 |
| commit | 3bd884511f8dc44a01e32878b2972443a16db70d (patch) | |
| tree | 97bf4af7947076a7e23f905a370a157e422fd967 /default-configs | |
| parent | 47934d0aadc075b05ce2d9e8a44fa6a46edd1afa (diff) | |
| download | qemu-3bd884511f8dc44a01e32878b2972443a16db70d.tar.gz qemu-3bd884511f8dc44a01e32878b2972443a16db70d.tar.bz2 qemu-3bd884511f8dc44a01e32878b2972443a16db70d.zip | |
hw: move timer devices to hw/timer/, configure with default-configs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'default-configs')
| -rw-r--r-- | default-configs/arm-softmmu.mak | 4 | ||||
| -rw-r--r-- | default-configs/sparc-softmmu.mak | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 8da5ec857e..94b52da3c8 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -34,6 +34,7 @@ CONFIG_MICRODRIVE=y CONFIG_USB_MUSB=y CONFIG_ARM_TIMER=y +CONFIG_ARM_MPTIMER=y CONFIG_PL011=y CONFIG_PL022=y CONFIG_PL031=y @@ -53,10 +54,13 @@ CONFIG_PXA2XX=y CONFIG_BITBANG_I2C=y CONFIG_FRAMEBUFFER=y CONFIG_XILINX_SPIPS=y + CONFIG_MARVELL_88W8618=y CONFIG_OMAP=y +CONFIG_TSC210X=y CONFIG_BLIZZARD=y CONFIG_ONENAND=y +CONFIG_TUSB6010=y CONFIG_IMX=y CONFIG_ZAURUS=y diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak index da5b02d405..6a2bad3962 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -10,5 +10,6 @@ CONFIG_EMPTY_SLOT=y CONFIG_PCNET_COMMON=y CONFIG_LANCE=y CONFIG_TCX=y +CONFIG_SLAVIO=y CONFIG_CS4231=y CONFIG_GRLIB=y |