4 files changed, 7 insertions, 5 deletions
diff --git a/configs/test/fs.py b/configs/test/fs.py
index 8686cdb5b..4a3876b36 100644
--- a/configs/test/fs.py
+++ b/configs/test/fs.py
@@ -5,7 +5,6 @@ from m5.objects import *
 m5.AddToPath('../common')
 from FSConfig import *
 from SysPaths import *
-from Util import *
 from Benchmarks import *
 
 parser = optparse.OptionParser()
@@ -50,12 +49,15 @@ if options.benchmark:
     bm = Benchmarks[options.benchmark]
 
     if len(bm) == 2:
-        root = makeDualRoot(makeLinuxAlphaSystem(cpu, mem_mode, bm[0]),
-                            makeLinuxAlphaSystem(cpu2, mem_mode, bm[1]))
-
+        s1 = makeLinuxAlphaSystem(mem_mode, bm[0])
+        s2 = makeLinuxAlphaSystem(mem_mode, bm[1])
+        cpu.connectMemPorts(s1.membus)
+        cpu2.connectMemPorts(s2.membus)
+        root = makeDualRoot(s1, s2)
     elif len(bm) == 1:
         root = Root(clock = '1THz',
-                    system = makeLinuxAlphaSystem(cpu, mem_mode, bm[0]))
+                    system = makeLinuxAlphaSystem(mem_mode, bm[0]))
+        cpu.connectMemPorts(root.system.membus)
     else:
         print "Error I don't know how to create more than 2 systems."
         sys.exit(1)
diff --git a/configs/test/hello b/configs/test/hello
deleted file mode 100755
index 59c0d195c..000000000
--- a/configs/test/hello
+++ /dev/null
diff --git a/configs/test/hello_mips b/configs/test/hello_mips
deleted file mode 100755
index a3db001ec..000000000
--- a/configs/test/hello_mips
+++ /dev/null
diff --git a/configs/test/sparc_tests/hello_sparc b/configs/test/sparc_tests/hello_sparc
deleted file mode 100755
index e254ae33f..000000000
--- a/configs/test/sparc_tests/hello_sparc
+++ /dev/null