From 76bceca2e1366e8670f3dce08f0826adb50fdefc Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 24 Sep 2020 00:37:04 -0700 Subject: [PATCH] arm,fastmodel: Update the VExpressFastModel to use ArmInterruptPins. The HDLCD device now uses an ArmInterruptPin instead of a GIC and interrupt number parameter. Change-Id: I31122e66a1c18f61592f3dca214ee057baad8f88 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/35039 Reviewed-by: Gabe Black Maintainer: Gabe Black Tested-by: kokoro --- src/dev/arm/VExpressFastmodel.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dev/arm/VExpressFastmodel.py b/src/dev/arm/VExpressFastmodel.py index 8cf899436..43f25efcf 100644 --- a/src/dev/arm/VExpressFastmodel.py +++ b/src/dev/arm/VExpressFastmodel.py @@ -24,6 +24,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. from m5.objects.FastModelGIC import FastModelGIC, SCFastModelGIC +from m5.objects.Gic import ArmInterruptPin from m5.objects.RealView import VExpress_GEM5_Base, HDLcd class VExpressFastmodel(VExpress_GEM5_Base): @@ -35,7 +36,8 @@ class VExpressFastmodel(VExpress_GEM5_Base): )) hdlcd = HDLcd( - pxl_clk=VExpress_GEM5_Base.dcc.osc_pxl, pio_addr=0x2b000000, int_num=95) + pxl_clk=VExpress_GEM5_Base.dcc.osc_pxl, pio_addr=0x2b000000, + interrupt=ArmInterruptPin(num=95)) def __init__(self, *args, **kwargs): super(VExpressFastmodel, self).__init__(*args, **kwargs) -- 2.30.2