summary refs log tree commit diff stats
path: root/include/hw/cpu
diff options
context:
space:
mode:
authorFrançois LEGAL <devel@thom.fr.eu.org>2013-12-01 23:37:11 -0800
committerPeter Maydell <peter.maydell@linaro.org>2013-12-10 13:28:25 +0000
commit57e72f2a1977448959fe4a492bc48cd2988c1f3b (patch)
tree18b5817a6e35e90bfc9911a4e50839a43cc623f5 /include/hw/cpu
parentc21c3b53e122a807ae4f5443b7f74f3850f21e37 (diff)
downloadfocaccia-qemu-57e72f2a1977448959fe4a492bc48cd2988c1f3b.tar.gz
focaccia-qemu-57e72f2a1977448959fe4a492bc48cd2988c1f3b.zip
cpu/a9mpcore: Add Global Timer
Add the global timer to A9 MPCore.

Signed-off-by: François LEGAL <devel@thom.fr.eu.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: ff92f35f438ac671b57d99d823723dd3e62d2c49.1385969450.git.peter.crosthwaite@xilinx.com
[PC Changes:
 * new commit message
 * split off original version as a separate patch
 * Rebased against new mpcore implementation (with struct embedding)
]
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/cpu')
-rw-r--r--include/hw/cpu/a9mpcore.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/hw/cpu/a9mpcore.h b/include/hw/cpu/a9mpcore.h
index 8eece07123..5d67ca22c4 100644
--- a/include/hw/cpu/a9mpcore.h
+++ b/include/hw/cpu/a9mpcore.h
@@ -14,6 +14,7 @@
 #include "hw/intc/arm_gic.h"
 #include "hw/misc/a9scu.h"
 #include "hw/timer/arm_mptimer.h"
+#include "hw/timer/a9gtimer.h"
 
 #define TYPE_A9MPCORE_PRIV "a9mpcore_priv"
 #define A9MPCORE_PRIV(obj) \
@@ -30,6 +31,7 @@ typedef struct A9MPPrivState {
 
     A9SCUState scu;
     GICState gic;
+    A9GTimerState gtimer;
     ARMMPTimerState mptimer;
     ARMMPTimerState wdt;
 } A9MPPrivState;