Yu-hsin Wang has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/36379 )
Change subject: dev-arm: Fix VExpressFastmodel configs
......................................................................
dev-arm: Fix VExpressFastmodel configs
1. HDLcd interrupt params should receive ArmSPI class
2. remove generic_timer hack because it is moved to off_chip_devices
Change-Id: I6ec7f9749546df3e8f125a5b96e7ed83cab2ea56
---
M src/dev/arm/VExpressFastmodel.py
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/dev/arm/VExpressFastmodel.py
b/src/dev/arm/VExpressFastmodel.py
index 43f25ef..47d51ac 100644
--- a/src/dev/arm/VExpressFastmodel.py
+++ b/src/dev/arm/VExpressFastmodel.py
@@ -24,7 +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.Gic import ArmSPI
from m5.objects.RealView import VExpress_GEM5_Base, HDLcd
class VExpressFastmodel(VExpress_GEM5_Base):
@@ -37,7 +37,7 @@
hdlcd = HDLcd(
pxl_clk=VExpress_GEM5_Base.dcc.osc_pxl, pio_addr=0x2b000000,
- interrupt=ArmInterruptPin(num=95))
+ interrupt=ArmSPI(num=95))
def __init__(self, *args, **kwargs):
super(VExpressFastmodel, self).__init__(*args, **kwargs)
@@ -45,7 +45,6 @@
def _on_chip_devices(self):
devices = super(VExpressFastmodel, self)._on_chip_devices()
devices += [ self.gic, self.hdlcd ]
- devices.remove(self.generic_timer)
return devices
def setupBootLoader(self, cur_sys, loc, boot_loader=None):
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/36379
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I6ec7f9749546df3e8f125a5b96e7ed83cab2ea56
Gerrit-Change-Number: 36379
Gerrit-PatchSet: 1
Gerrit-Owner: Yu-hsin Wang <yuhsi...@google.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
