From 14ca2e462ee137974d81729b1d88d9d39cf2f22c Mon Sep 17 00:00:00 2001 From: Peter Crosthwaite Date: Thu, 14 May 2015 19:23:12 -0700 Subject: arm: xlnx-zynqmp: Add GEM support There are 4x Cadence GEMs in ZynqMP. Add them. Reviewed-by: Peter Maydell Tested-by: Alistair Francis Signed-off-by: Peter Crosthwaite Message-id: 7d3e68e5495d145255f0ee567046415e3a26d67e.1431381507.git.peter.crosthwaite@xilinx.com Signed-off-by: Peter Maydell --- include/hw/arm/xlnx-zynqmp.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/hw/arm/xlnx-zynqmp.h') diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index 719bc8b3ef..c6ccbd8981 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -20,12 +20,14 @@ #include "qemu-common.h" #include "hw/arm/arm.h" #include "hw/intc/arm_gic.h" +#include "hw/net/cadence_gem.h" #define TYPE_XLNX_ZYNQMP "xlnx,zynqmp" #define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \ TYPE_XLNX_ZYNQMP) #define XLNX_ZYNQMP_NUM_CPUS 4 +#define XLNX_ZYNQMP_NUM_GEMS 4 #define XLNX_ZYNQMP_GIC_REGIONS 2 @@ -46,6 +48,7 @@ typedef struct XlnxZynqMPState { ARMCPU cpu[XLNX_ZYNQMP_NUM_CPUS]; GICState gic; MemoryRegion gic_mr[XLNX_ZYNQMP_GIC_REGIONS][XLNX_ZYNQMP_GIC_ALIASES]; + CadenceGEMState gem[XLNX_ZYNQMP_NUM_GEMS]; } XlnxZynqMPState; #define XLNX_ZYNQMP_H -- cgit v1.2.3