From 27b14cae9d8b9878b43b32bd28089a273a1075c7 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 14 Jan 2021 10:10:41 +0000 Subject: 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 --- include/hw/arm/armsse.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/hw') 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; -- cgit v1.2.3