summaryrefslogtreecommitdiff
path: root/configs/common
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2011-08-19 15:08:08 -0500
committerAli Saidi <Ali.Saidi@ARM.com>2011-08-19 15:08:08 -0500
commit2fd2b44b86c3d40e76f1e1641001074230208b3f (patch)
tree217bb533cd4bb5773fdb05e19146be8894ad65ff /configs/common
parentd2a0a2ec2202eb8fa04ddd3e359c1c9dc7f04cb1 (diff)
downloadgem5-2fd2b44b86c3d40e76f1e1641001074230208b3f.tar.xz
ARM: Add VExpress_E support with PCIe to gem5
Diffstat (limited to 'configs/common')
-rw-r--r--configs/common/FSConfig.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index f11235e93..4d7d2406f 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -210,8 +210,8 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False):
self.realview = RealViewPBX()
elif machine_type == "RealView_EB":
self.realview = RealViewEB()
- elif machine_type == "VersatileExpress":
- self.realview = VExpress()
+ elif machine_type == "VExpress_ELT":
+ self.realview = VExpress_ELT()
else:
print "Unknown Machine Type"
sys.exit(1)
@@ -221,8 +221,12 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False):
use_cf = True
self.cf0 = CowIdeDisk(driveID='master')
self.cf0.childImage(mdesc.disk())
- self.realview.cf_ctrl.disks = [self.cf0]
-
+ # default to an IDE controller rather than a CF one
+ # assuming we've got one
+ try:
+ self.realview.ide.disks = [self.cf0]
+ except:
+ self.realview.cf_ctrl.disks = [self.cf0]
if bare_metal:
# EOT character on UART will end the simulation
self.realview.uart.end_on_eot = True
@@ -261,7 +265,6 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False):
self.physmem.port = self.membus.port
self.realview.attachOnChipIO(self.membus)
self.realview.attachIO(self.iobus)
-
self.intrctrl = IntrControl()
self.terminal = Terminal()
self.vncserver = VncServer()