regressions: update a couple of configs

The configs for pc-simple-timing-ruby, t1000-simple-atomic had not been
updated correctly in the patch 6e6cefc1db1f.

diff --git a/tests/configs/pc-simple-timing-ruby.py b/tests/configs/pc-simple-timing-ruby.py
index 5799c0c7aeead682ce7ccc8f817dd417942f82a9..e0ef72db9b1ba2144b89652b78f6fd3cb0034b40 100644 (file)
--- a/tests/configs/pc-simple-timing-ruby.py
+++ b/tests/configs/pc-simple-timing-ruby.py
@@ -56,10 +56,13 @@ options.num_cpus = 2
 #the system
 mdesc = SysConfig(disk = 'linux-x86.img')
 system = FSConfig.makeLinuxX86System('timing', DDR3_1600_x64, options.num_cpus,
-                                     mdesc=mdesc, Ruby=True,
+                                     mdesc=mdesc, Ruby=True)
 
 system.kernel = FSConfig.binary('x86_64-vmlinux-2.6.22.9.smp')
-system.cpu = [TimingSimpleCPU(cpu_id=i) for i in xrange(options.num_cpus)]
+system.clk_domain = SrcClockDomain(clock = '1GHz')
+system.cpu_clk_domain = SrcClockDomain(clock = '2GHz')
+system.cpu = [TimingSimpleCPU(cpu_id=i, clk_domain = system.cpu_clk_domain)
+              for i in xrange(options.num_cpus)]
 
 Ruby.create_system(options, system, system.piobus, system._dma_ports)
 

diff --git a/tests/configs/t1000-simple-atomic.py b/tests/configs/t1000-simple-atomic.py
index 7f04751b86d09e090bf34228d88c38e3fd62c680..c0744a6a2febf574621b081ea2878a7009a20875 100644 (file)
--- a/tests/configs/t1000-simple-atomic.py
+++ b/tests/configs/t1000-simple-atomic.py
@@ -31,8 +31,10 @@ from m5.objects import *
 m5.util.addToPath('../configs/common')
 import FSConfig
 
-cpu = AtomicSimpleCPU(cpu_id=0)
 system = FSConfig.makeSparcSystem('atomic', SimpleMemory)
+system.clk_domain = SrcClockDomain(clock = '1GHz')
+system.cpu_clk_domain = SrcClockDomain(clock = '1GHz')
+cpu = AtomicSimpleCPU(cpu_id=0, clk_domain = system.cpu_clk_domain)
 system.cpu = cpu
 # create the interrupt controller
 cpu.createInterruptController()