diff options
| author | Peter Crosthwaite <peter.crosthwaite@xilinx.com> | 2015-05-14 19:23:12 -0700 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-05-18 16:41:11 +0100 |
| commit | 14ca2e462ee137974d81729b1d88d9d39cf2f22c (patch) | |
| tree | dab8657f40aafe8775f21f3fd8dc35c574f0981e /include/hw/arm/xlnx-zynqmp.h | |
| parent | f49856d4e65703e347ee3e2277a87282ce601bcd (diff) | |
| download | qemu-14ca2e462ee137974d81729b1d88d9d39cf2f22c.zip | |
arm: xlnx-zynqmp: Add GEM support
There are 4x Cadence GEMs in ZynqMP. Add them.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Message-id: 7d3e68e5495d145255f0ee567046415e3a26d67e.1431381507.git.peter.crosthwaite@xilinx.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/arm/xlnx-zynqmp.h')
| -rw-r--r-- | include/hw/arm/xlnx-zynqmp.h | 3 |
1 files changed, 3 insertions, 0 deletions
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 |