aboutsummaryrefslogtreecommitdiff
path: root/hw/arm
diff options
context:
space:
mode:
authorPeter Chubb <peter.chubb@nicta.com.au>2012-07-04 10:43:33 +0000
committerPeter Maydell <peter.maydell@linaro.org>2012-07-04 10:43:33 +0000
commit78d1404dcc9082fa52240cd04f822d54566d6849 (patch)
tree8edbb9b6e636d1d75b76b86d85027af415325362 /hw/arm
parentbcc181b0ad84bfa2369f39c55c63752820d49284 (diff)
i.MX31: Timers
Implement the timers on the Freescale i.MX31 SoC. This is not a complete implementation, but gives enough for Linux to boot and run. In particular external triggers, which are not useful under QEMU, are not implemented. Signed-off-by: Philip O'Sullivan <philipo@ok-labs.com> Signed-off-by: Peter Chubb <peter.chubb@nicta.com.au> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm')
-rw-r--r--hw/arm/Makefile.objs2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 110f2f12fa..4109162028 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -35,7 +35,7 @@ obj-y += framebuffer.o
obj-y += vexpress.o
obj-y += strongarm.o
obj-y += collie.o
-obj-y += imx_serial.o imx_ccm.o
+obj-y += imx_serial.o imx_ccm.o imx_timer.o
obj-y += pl041.o lm4549.o
obj-$(CONFIG_FDT) += ../device_tree.o