summaryrefslogtreecommitdiff
path: root/configs/common
diff options
context:
space:
mode:
Diffstat (limited to 'configs/common')
-rw-r--r--configs/common/FSConfig.py1
-rw-r--r--configs/common/Simulation.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index da35698f2..be3f5ff79 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -132,5 +132,4 @@ def makeDualRoot(testSystem, driveSystem, dumpfile):
self.etherdump = EtherDump(file=dumpfile)
self.etherlink.dump = Parent.etherdump
- self.clock = '1THz'
return self
diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py
index 8374d2fb5..61b14f026 100644
--- a/configs/common/Simulation.py
+++ b/configs/common/Simulation.py
@@ -64,7 +64,7 @@ def run(options, root, testsys, cpu_class):
if options.maxtick:
maxtick = options.maxtick
elif options.maxtime:
- simtime = int(options.maxtime * root.clock.value)
+ simtime = m5.ticks.seconds(simtime)
print "simulating for: ", simtime
maxtick = simtime
else: