diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/arm/Makefile.objs | 17 | ||||
| -rw-r--r-- | hw/cris/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/input/Makefile.objs | 4 | ||||
| -rw-r--r-- | hw/input/milkymist-softusb.c (renamed from hw/milkymist-softusb.c) | 0 | ||||
| -rw-r--r-- | hw/input/pxa2xx_keypad.c (renamed from hw/pxa2xx_keypad.c) | 0 | ||||
| -rw-r--r-- | hw/input/tsc210x.c (renamed from hw/tsc210x.c) | 0 | ||||
| -rw-r--r-- | hw/lm32/Makefile.objs | 3 | ||||
| -rw-r--r-- | hw/sh4/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/sparc/Makefile.objs | 4 | ||||
| -rw-r--r-- | hw/timer/Makefile.objs | 16 | ||||
| -rw-r--r-- | hw/timer/arm_mptimer.c (renamed from hw/arm_mptimer.c) | 0 | ||||
| -rw-r--r-- | hw/timer/etraxfs_timer.c (renamed from hw/etraxfs_timer.c) | 0 | ||||
| -rw-r--r-- | hw/timer/exynos4210_mct.c (renamed from hw/exynos4210_mct.c) | 0 | ||||
| -rw-r--r-- | hw/timer/exynos4210_pwm.c (renamed from hw/exynos4210_pwm.c) | 0 | ||||
| -rw-r--r-- | hw/timer/exynos4210_rtc.c (renamed from hw/exynos4210_rtc.c) | 0 | ||||
| -rw-r--r-- | hw/timer/grlib_gptimer.c (renamed from hw/grlib_gptimer.c) | 0 | ||||
| -rw-r--r-- | hw/timer/imx_timer.c (renamed from hw/imx_timer.c) | 0 | ||||
| -rw-r--r-- | hw/timer/lm32_timer.c (renamed from hw/lm32_timer.c) | 0 | ||||
| -rw-r--r-- | hw/timer/milkymist-sysctl.c (renamed from hw/milkymist-sysctl.c) | 0 | ||||
| -rw-r--r-- | hw/timer/omap_gptimer.c (renamed from hw/omap_gptimer.c) | 0 | ||||
| -rw-r--r-- | hw/timer/omap_synctimer.c (renamed from hw/omap_synctimer.c) | 0 | ||||
| -rw-r--r-- | hw/timer/pxa2xx_timer.c (renamed from hw/pxa2xx_timer.c) | 0 | ||||
| -rw-r--r-- | hw/timer/sh_timer.c (renamed from hw/sh_timer.c) | 0 | ||||
| -rw-r--r-- | hw/timer/slavio_timer.c (renamed from hw/slavio_timer.c) | 0 | ||||
| -rw-r--r-- | hw/timer/tusb6010.c (renamed from hw/tusb6010.c) | 0 |
25 files changed, 30 insertions, 17 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)) diff --git a/hw/cris/Makefile.objs b/hw/cris/Makefile.objs index c4d5189fc0..a8a4a9efcf 100644 --- a/hw/cris/Makefile.objs +++ b/hw/cris/Makefile.objs @@ -1,7 +1,6 @@ # IO blocks obj-y += etraxfs_dma.o obj-y += etraxfs_pic.o -obj-y += etraxfs_timer.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/input/Makefile.objs b/hw/input/Makefile.objs index 824997e367..e8c80b9de2 100644 --- a/hw/input/Makefile.objs +++ b/hw/input/Makefile.objs @@ -7,3 +7,7 @@ common-obj-y += ps2.o common-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o common-obj-$(CONFIG_TSC2005) += tsc2005.o common-obj-$(CONFIG_VMMOUSE) += vmmouse.o + +obj-$(CONFIG_MILKYMIST) += milkymist-softusb.o +obj-$(CONFIG_PXA2XX) += pxa2xx_keypad.o +obj-$(CONFIG_TSC210X) += tsc210x.o diff --git a/hw/milkymist-softusb.c b/hw/input/milkymist-softusb.c index 3edab4ff0b..3edab4ff0b 100644 --- a/hw/milkymist-softusb.c +++ b/hw/input/milkymist-softusb.c diff --git a/hw/pxa2xx_keypad.c b/hw/input/pxa2xx_keypad.c index 1fd5f2076a..1fd5f2076a 100644 --- a/hw/pxa2xx_keypad.c +++ b/hw/input/pxa2xx_keypad.c diff --git a/hw/tsc210x.c b/hw/input/tsc210x.c index e6c217c8db..e6c217c8db 100644 --- a/hw/tsc210x.c +++ b/hw/input/tsc210x.c diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs index e1161566ad..f911ac61d1 100644 --- a/hw/lm32/Makefile.objs +++ b/hw/lm32/Makefile.objs @@ -1,12 +1,9 @@ # LM32 peripherals obj-y += lm32_pic.o -obj-y += lm32_timer.o obj-y += lm32_sys.o obj-y += milkymist-hpdmc.o obj-y += milkymist-memcard.o obj-y += milkymist-pfpu.o -obj-y += milkymist-softusb.o -obj-y += milkymist-sysctl.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs index 10c971a300..76b37bbf6b 100644 --- a/hw/sh4/Makefile.objs +++ b/hw/sh4/Makefile.objs @@ -1,4 +1,4 @@ -obj-y += sh_timer.o sh_intc.o sh_pci.o +obj-y += sh_intc.o sh_pci.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs index e18bc67fc7..ab1d91c2b9 100644 --- a/hw/sparc/Makefile.objs +++ b/hw/sparc/Makefile.objs @@ -1,9 +1,9 @@ obj-y = sun4m_iommu.o slavio_intctl.o -obj-y += slavio_timer.o slavio_misc.o sparc32_dma.o +obj-y += slavio_misc.o sparc32_dma.o obj-y += eccmemctl.o sbi.o sun4c_intctl.o # GRLIB -obj-y += grlib_gptimer.o grlib_irqmp.o +obj-y += grlib_irqmp.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs index a1ef26cf34..e4bd17fbb7 100644 --- a/hw/timer/Makefile.objs +++ b/hw/timer/Makefile.objs @@ -8,5 +8,21 @@ common-obj-$(CONFIG_PL031) += pl031.o common-obj-$(CONFIG_PUV3) += puv3_ost.o common-obj-$(CONFIG_TWL92230) += twl92230.o common-obj-$(CONFIG_XILINX) += xilinx_timer.o +common-obj-$(CONFIG_SLAVIO) += slavio_timer.o +common-obj-$(CONFIG_ETRAXFS) += etraxfs_timer.o +common-obj-$(CONFIG_GRLIB) += grlib_gptimer.o +common-obj-$(CONFIG_IMX) += imx_timer.o +common-obj-$(CONFIG_LM32) += lm32_timer.o +common-obj-$(CONFIG_MILKYMIST) += milkymist-sysctl.o +obj-$(CONFIG_EXYNOS4) += exynos4210_mct.o +obj-$(CONFIG_EXYNOS4) += exynos4210_pwm.o +obj-$(CONFIG_EXYNOS4) += exynos4210_rtc.o +obj-$(CONFIG_OMAP) += omap_gptimer.o +obj-$(CONFIG_OMAP) += omap_synctimer.o +obj-$(CONFIG_PXA2XX) += pxa2xx_timer.o +obj-$(CONFIG_SH4) += sh_timer.o +obj-$(CONFIG_TUSB6010) += tusb6010.o + +obj-$(CONFIG_ARM_MPTIMER) += arm_mptimer.o obj-$(CONFIG_MC146818RTC) += mc146818rtc.o diff --git a/hw/arm_mptimer.c b/hw/timer/arm_mptimer.c index 317f5e43ed..317f5e43ed 100644 --- a/hw/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c diff --git a/hw/etraxfs_timer.c b/hw/timer/etraxfs_timer.c index 3cd9476bb1..3cd9476bb1 100644 --- a/hw/etraxfs_timer.c +++ b/hw/timer/etraxfs_timer.c diff --git a/hw/exynos4210_mct.c b/hw/timer/exynos4210_mct.c index 87ce75b643..87ce75b643 100644 --- a/hw/exynos4210_mct.c +++ b/hw/timer/exynos4210_mct.c diff --git a/hw/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c index 185ccb9a74..185ccb9a74 100644 --- a/hw/exynos4210_pwm.c +++ b/hw/timer/exynos4210_pwm.c diff --git a/hw/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c index bceee44cb2..bceee44cb2 100644 --- a/hw/exynos4210_rtc.c +++ b/hw/timer/exynos4210_rtc.c diff --git a/hw/grlib_gptimer.c b/hw/timer/grlib_gptimer.c index 7043a34684..7043a34684 100644 --- a/hw/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c diff --git a/hw/imx_timer.c b/hw/timer/imx_timer.c index 03197e3f54..03197e3f54 100644 --- a/hw/imx_timer.c +++ b/hw/timer/imx_timer.c diff --git a/hw/lm32_timer.c b/hw/timer/lm32_timer.c index e06fac7082..e06fac7082 100644 --- a/hw/lm32_timer.c +++ b/hw/timer/lm32_timer.c diff --git a/hw/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c index e083a280c4..e083a280c4 100644 --- a/hw/milkymist-sysctl.c +++ b/hw/timer/milkymist-sysctl.c diff --git a/hw/omap_gptimer.c b/hw/timer/omap_gptimer.c index 9b0e9dd567..9b0e9dd567 100644 --- a/hw/omap_gptimer.c +++ b/hw/timer/omap_gptimer.c diff --git a/hw/omap_synctimer.c b/hw/timer/omap_synctimer.c index a24f35c277..a24f35c277 100644 --- a/hw/omap_synctimer.c +++ b/hw/timer/omap_synctimer.c diff --git a/hw/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c index 8ea2416dd7..8ea2416dd7 100644 --- a/hw/pxa2xx_timer.c +++ b/hw/timer/pxa2xx_timer.c diff --git a/hw/sh_timer.c b/hw/timer/sh_timer.c index f92ff4f73f..f92ff4f73f 100644 --- a/hw/sh_timer.c +++ b/hw/timer/sh_timer.c diff --git a/hw/slavio_timer.c b/hw/timer/slavio_timer.c index 1145a87603..1145a87603 100644 --- a/hw/slavio_timer.c +++ b/hw/timer/slavio_timer.c diff --git a/hw/tusb6010.c b/hw/timer/tusb6010.c index 533938a9b4..533938a9b4 100644 --- a/hw/tusb6010.c +++ b/hw/timer/tusb6010.c |