summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-01-03 00:52:30 -0500
committerGabe Black <gblack@eecs.umich.edu>2007-01-03 00:52:30 -0500
commit8840ebcb00f3988c781063e572b6df5742968f95 (patch)
treee9711f561dff45b31489a7fb539ed98660e26d0e /configs
parenta0e8aa6737f534a8e51d866728dd6dc59bef263d (diff)
parent7d7f3d0e99eca98a5659e73bce56d615f0ed4fc3 (diff)
downloadgem5-8840ebcb00f3988c781063e572b6df5742968f95.tar.xz
Merge zizzer:/bk/newmem
into zower.eecs.umich.edu:/eecshome/m5/newmem --HG-- extra : convert_revision : f4a05accb8fa24d425dd818b1b7f268378180e99
Diffstat (limited to 'configs')
-rw-r--r--configs/example/fs.py12
1 files changed, 11 insertions, 1 deletions
diff --git a/configs/example/fs.py b/configs/example/fs.py
index d479d717e..b878f2bd4 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2006 The Regents of The University of Michigan
+# Copyright (c) 2006-2007 The Regents of The University of Michigan
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -46,6 +46,10 @@ config_root = os.path.dirname(config_path)
parser = optparse.OptionParser()
+# System options
+parser.add_option("--kernel", action="store", type="string")
+parser.add_option("--script", action="store", type="string")
+
# Benchmark options
parser.add_option("--l2cache", action="store_true")
parser.add_option("--dual", action="store_true",
@@ -99,6 +103,12 @@ elif m5.build_env['TARGET_ISA'] == "sparc":
else:
m5.panic("incapable of building non-alpha or non-sparc full system!")
+if options.kernel is not None:
+ test_sys.kernel = binary(options.kernel)
+
+if options.script is not None:
+ test_sys.readfile = options.script
+
np = options.num_cpus
if options.l2cache: