merge alpha system files into tree

3 files changed, 15 insertions, 7 deletions

diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 44ac104b5..f58fd3d2e 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -238,6 +238,7 @@ def makeLinuxArmSystem(mem_mode, mdesc = None, bare_metal=False,
 
     self.intrctrl = IntrControl()
     self.terminal = Terminal()
+    self.vncserver = VncServer()
     self.kernel = binary('vmlinux.arm')
     self.boot_osflags = 'earlyprintk mem=128MB console=ttyAMA0 lpj=19988480' + \
                         ' norandmaps slram=slram0,0x8000000,+0x8000000' +      \
@@ -334,6 +335,9 @@ def makeX86System(mem_mode, numCPUs = 1, mdesc = None, self = None, Ruby = False
     # Create and connect the busses required by each memory system
     if Ruby:
         connectX86RubySystem(self)
+        # add the ide to the list of dma devices that later need to attach to
+        # dma controllers
+        self._dma_devices = [self.pc.south_bridge.ide]
     else:
         connectX86ClassicSystem(self)
 
diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py
index adc8e6147..2081a10c4 100644
--- a/configs/example/ruby_fs.py
+++ b/configs/example/ruby_fs.py
@@ -111,19 +111,17 @@ CPUClass.clock = options.clock
 
 if buildEnv['TARGET_ISA'] == "alpha":
     system = makeLinuxAlphaRubySystem(test_mem_mode, bm[0])
-    system.ruby = Ruby.create_system(options,
-                                     system,
-                                     system.piobus,
-                                     system.dma_devices)
 elif buildEnv['TARGET_ISA'] == "x86":
     system = makeLinuxX86System(test_mem_mode, options.num_cpus, bm[0], True)
     setWorkCountOptions(system, options)
-    system.ruby = Ruby.create_system(options,
-                                     system,
-                                     system.piobus)
 else:
     fatal("incapable of building non-alpha or non-x86 full system!")
 
+system.ruby = Ruby.create_system(options,
+                                 system,
+                                 system.piobus,
+                                 system._dma_devices)
+
 system.cpu = [CPUClass(cpu_id=i) for i in xrange(options.num_cpus)]
 
 for (i, cpu) in enumerate(system.cpu):
diff --git a/configs/example/ruby_mem_test.py b/configs/example/ruby_mem_test.py
index e32e0c114..f58ebc1de 100644
--- a/configs/example/ruby_mem_test.py
+++ b/configs/example/ruby_mem_test.py
@@ -135,6 +135,12 @@ for (i, cpu) in enumerate(cpus):
     cpu.test = system.ruby.cpu_ruby_ports[i].port
     cpu.functional = system.funcmem.port
 
+    #
+    # Since the memtester is incredibly bursty, increase the deadlock
+    # threshold to 5 million cycles
+    #
+    system.ruby.cpu_ruby_ports[i].deadlock_threshold = 5000000
+
 for (i, dma) in enumerate(dmas):
     #
     # Tie the dma memtester ports to the correct functional port