From 2fd2b44b86c3d40e76f1e1641001074230208b3f Mon Sep 17 00:00:00 2001
From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Fri, 19 Aug 2011 15:08:08 -0500
Subject: ARM: Add VExpress_E support with PCIe to gem5

---
 configs/common/FSConfig.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'configs/common')

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()
-- 
cgit v1.2.3