summaryrefslogtreecommitdiffstats
path: root/include/hw/arm
diff options
context:
space:
mode:
authorPeter Maydell2021-02-19 15:45:56 +0100
committerPeter Maydell2021-03-08 18:20:02 +0100
commite94d7723b5c0e7e51775ee8fc94a10e975392d0b (patch)
tree17aa15ac7c5ab97f1eed4272974999ab3363aab1 /include/hw/arm
parenthw/arm/armsse: Add a define for number of IRQs used by the SSE itself (diff)
downloadqemu-e94d7723b5c0e7e51775ee8fc94a10e975392d0b.tar.gz
qemu-e94d7723b5c0e7e51775ee8fc94a10e975392d0b.tar.xz
qemu-e94d7723b5c0e7e51775ee8fc94a10e975392d0b.zip
hw/arm/armsse: Add framework for data-driven device placement
The SSE-300 is mostly the same as the SSE-200, but it has moved some of the devices in the memory map and uses different device types in some cases. To accommodate this, add a framework where the placement and wiring of some devices can be specified in a data table. This commit adds the framework for this data-driven device placement, and makes the CMSDK APB timer devices use it. Subsequent commits will convert the other devices which differ between SSE-200 and SSE-300. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20210219144617.4782-24-peter.maydell@linaro.org
Diffstat (limited to 'include/hw/arm')
-rw-r--r--include/hw/arm/armsse.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/hw/arm/armsse.h b/include/hw/arm/armsse.h
index e34263fed8..c1f4df295a 100644
--- a/include/hw/arm/armsse.h
+++ b/include/hw/arm/armsse.h
@@ -158,8 +158,7 @@ struct ARMSSE {
IoTKitSecCtl secctl;
TZPPC apb_ppc[NUM_INTERNAL_PPCS];
TZMPC mpc[IOTS_NUM_MPC];
- CMSDKAPBTimer timer0;
- CMSDKAPBTimer timer1;
+ CMSDKAPBTimer timer[2];
CMSDKAPBTimer s32ktimer;
qemu_or_irq ppc_irq_orgate;
SplitIRQ sec_resp_splitter;