]> git.proxmox.com Git - mirror_qemu.git/commit - hw/a9mpcore.c
arm: mptimer: Remove WDT distinction
authorPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Thu, 28 Feb 2013 18:23:13 +0000 (18:23 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 28 Feb 2013 18:23:13 +0000 (18:23 +0000)
commitcde4577f11cd557cfd48d752b7a0929d19eac9e9
tree1fa3078af05c84f29e90f0c1cba8eefc2df14ea5
parent845769fc6319d308a39a78734c6dc03fa93ff2c5
arm: mptimer: Remove WDT distinction

In QEMU emulation, there is no functional difference between the ARM mpcore
private timers and watchdogs. Removed all the distinction between the two from
arm_mptimer.c and converted it to be just the mptimer. a9mpcore and arm11mpcore
just instantiate the same mptimer object twice to get both timer and WDT.

If in the future we want to make the WDT functionally different then we can use
either QOM hierarchy to derive WDT from from mptimer, or we can add a property
"is-wdt" or some such.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
hw/a9mpcore.c
hw/arm11mpcore.c
hw/arm_mptimer.c