diff -r 95dcdea3ca41 -r 47897ce4b13d configs/ruby/MOESI_CMP_token.py
--- a/configs/ruby/MOESI_CMP_token.py	Thu Aug 05 21:15:08 2010 -0700
+++ b/configs/ruby/MOESI_CMP_token.py	Thu Aug 05 21:15:17 2010 -0700
@@ -45,7 +45,12 @@
     latency = 15
 
 def define_options(parser):
-    return
+    parser.add_option("--l1-retries", type="int", default=1,
+                      help="Token_CMP: # of l1 retries before going persistent")
+    parser.add_option("--timeout-latency", type="int", default=300,
+                      help="Token_CMP: cycles until issuing again");
+    parser.add_option("--disable-dyn-timeouts", action="store_true",
+          help="Token_CMP: disable dyanimc timeouts, use fixed latency instead")
 
 def create_system(options, phys_mem, piobus, dma_devices):
     
@@ -99,7 +104,13 @@
                                       L1DcacheMemory = l1d_cache,
                                       l2_select_num_bits = \
                                         math.log(options.num_l2caches, 2),
-                                      N_tokens = n_tokens)
+                                      N_tokens = n_tokens,
+                                      retry_threshold = options.l1_retries,
+                                      fixed_timeout_latency = \
+                                        options.timeout_latency,
+                                      dynamic_timeout_enabled = \
+                                        not options.disable_dyn_timeouts)
+
         #
         # Add controllers and sequencers to the appropriate lists
         #