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 /hw/arm | |
parent | 47934d0aadc075b05ce2d9e8a44fa6a46edd1afa (diff) | |
download | 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 'hw/arm')
-rw-r--r-- | hw/arm/Makefile.objs | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 26e107f93c..7691540297 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -3,23 +3,20 @@ obj-y += arm_gic.o arm_gic_common.o obj-y += a9scu.o obj-y += realview_gic.o arm_sysctl.o arm11mpcore.o a9mpcore.o obj-y += exynos4210_gic.o exynos4210_combiner.o -obj-y += exynos4210_pwm.o -obj-y += exynos4210_pmu.o exynos4210_mct.o -obj-y += exynos4210_rtc.o -obj-y += arm_mptimer.o a15mpcore.o +obj-y += exynos4210_pmu.o +obj-y += a15mpcore.o obj-y += armv7m_nvic.o -obj-y += pxa2xx_timer.o pxa2xx_dma.o -obj-y += pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o +obj-y += pxa2xx_dma.o +obj-y += pxa2xx_mmci.o pxa2xx_pcmcia.o obj-y += zaurus.o obj-y += omap_dma.o omap_clk.o omap_mmc.o \ omap_gpio.o omap_intc.o -obj-y += soc_dma.o omap_gptimer.o omap_synctimer.o \ +obj-y += soc_dma.o \ omap_gpmc.o omap_sdrc.o omap_tap.o omap_l4.o -obj-y += tsc210x.o -obj-y += cbus.o tusb6010.o +obj-y += cbus.o obj-y += mst_fpga.o obj-y += strongarm.o -obj-y += imx_ccm.o imx_timer.o imx_avic.o +obj-y += imx_ccm.o imx_avic.o obj-$(CONFIG_KVM) += kvm/arm_gic.o obj-y := $(addprefix ../,$(obj-y)) |