diff -r 927068b26e2f -r 3bf604697858 configs/common/CacheConfig.py
--- a/configs/common/CacheConfig.py	Fri Feb 11 18:37:03 2011 -0600
+++ b/configs/common/CacheConfig.py	Fri Feb 11 18:37:48 2011 -0600
@@ -35,7 +35,8 @@
 
 def config_cache(options, system):
     if options.l2cache:
-        system.l2 = L2Cache(size='2MB')
+        system.l2 = L2Cache(size=options.l2_size, assoc=options.l2_assoc,
+                block_size=options.cacheline_size)
         system.tol2bus = Bus()
         system.l2.cpu_side = system.tol2bus.port
         system.l2.mem_side = system.membus.port
@@ -44,13 +45,18 @@
     for i in xrange(options.num_cpus):
         if options.caches:
             if buildEnv['TARGET_ISA'] == 'x86':
-                system.cpu[i].addPrivateSplitL1Caches(L1Cache(size = '32kB'),
-                                                      L1Cache(size = '64kB'),
-                                                      PageTableWalkerCache(),
-                                                      PageTableWalkerCache())
+                system.cpu[i].addPrivateSplitL1Caches(
+                    L1Cache(size=options.l1i_size, assoc=options.l1i_assoc,
+                            block_size=options.cacheline_size),
+                    L1Cache(size=options.l1d_size, assoc=options.l1d_assoc,
+                            block_size=options.cacheline_size),
+                    PageTableWalkerCache(), PageTableWalkerCache())
             else:
-                system.cpu[i].addPrivateSplitL1Caches(L1Cache(size = '32kB'),
-                                                      L1Cache(size = '64kB'))
+                system.cpu[i].addPrivateSplitL1Caches(
+                    L1Cache(size=options.l1i_size, assoc=options.l1i_assoc,
+                            block_size=options.cacheline_size),
+                    L1Cache(size=options.l1d_size, assoc=options.l1d_assoc,
+                            block_size=options.cacheline_size))
         if options.l2cache:
             system.cpu[i].connectAllPorts(system.tol2bus, system.membus)
         else:
diff -r 927068b26e2f -r 3bf604697858 configs/common/Options.py
--- a/configs/common/Options.py	Fri Feb 11 18:37:03 2011 -0600
+++ b/configs/common/Options.py	Fri Feb 11 18:37:48 2011 -0600
@@ -38,14 +38,16 @@
 parser.add_option("--num-dirs", type="int", default=1)
 parser.add_option("--num-l2caches", type="int", default=1)
 parser.add_option("--num-l3caches", type="int", default=1)
-parser.add_option("--l1d_size", type="string", default="32kB")
+parser.add_option("--l1d_size", type="string", default="64kB")
 parser.add_option("--l1i_size", type="string", default="32kB")
 parser.add_option("--l2_size", type="string", default="2MB")
 parser.add_option("--l3_size", type="string", default="16MB")
 parser.add_option("--l1d_assoc", type="int", default=2)
 parser.add_option("--l1i_assoc", type="int", default=2)
-parser.add_option("--l2_assoc", type="int", default=16)
+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)
+
 
 # Run duration options
 parser.add_option("-m", "--maxtick", type="int", default=m5.MaxTick,