From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Thu, 1 Mar 2012 17:36:59 +0000 (-0600)
Subject: Config: make option ruby available always
X-Git-Tag: stable_2012_06_28~211
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e11847bfa949481322f2031049402a093ed442a7;p=gem5.git

Config: make option ruby available always
---

diff --git a/configs/common/Options.py b/configs/common/Options.py
index 0932f2629..5fd6177c9 100644
--- a/configs/common/Options.py
+++ b/configs/common/Options.py
@@ -48,6 +48,7 @@ parser.add_option("--l1i_assoc", type="int", default=2)
 parser.add_option("--l2_assoc", type="int", default=8)
 parser.add_option("--l3_assoc", type="int", default=16)
 parser.add_option("--cacheline_size", type="int", default=64)
+parser.add_option("--ruby", action="store_true")
 
 # Run duration options
 parser.add_option("-m", "--maxtick", type="int", default=m5.MaxTick,
diff --git a/configs/example/se.py b/configs/example/se.py
index de98fa002..f2a26709e 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -82,10 +82,8 @@ parser.add_option("--errout", default="", help="Redirect stderr to a file.")
 
 execfile(os.path.join(config_root, "common", "Options.py"))
 
-if buildEnv['PROTOCOL'] != 'None':
-    parser.add_option("--ruby", action="store_true")
-    if '--ruby' in sys.argv:
-        Ruby.define_options(parser)
+if '--ruby' in sys.argv:
+    Ruby.define_options(parser)
 
 (options, args) = parser.parse_args()