diff -r 68a5b8bba293 -r 842d1dd7adc1 configs/common/CacheConfig.py
--- a/configs/common/CacheConfig.py	Sat Feb 12 10:14:52 2011 -0500
+++ b/configs/common/CacheConfig.py	Fri Feb 18 12:31:40 2011 -0500
@@ -35,7 +35,7 @@
 
 def config_cache(options, system):
     if options.l2cache:
-        system.l2 = L2Cache(size='2MB')
+        system.l2 = L2Cache(size = options.l2_size, assoc = options.l2_assoc)
         system.tol2bus = Bus()
         system.l2.cpu_side = system.tol2bus.port
         system.l2.mem_side = system.membus.port
@@ -43,14 +43,16 @@
 
     for i in xrange(options.num_cpus):
         if options.caches:
+            icache = L1Cache(size = options.l1i_size, assoc = options.l1i_assoc,
+                             blocksize = options.cacheline_size)
+            dcache = L1Cache(size = options.l1d_size, assoc = options.l1d_assoc,
+                             blocksize = options.cacheline_size)
             if buildEnv['TARGET_ISA'] == 'x86':
-                system.cpu[i].addPrivateSplitL1Caches(L1Cache(size = '32kB'),
-                                                      L1Cache(size = '64kB'),
+                system.cpu[i].addPrivateSplitL1Caches(icache, dcache,
                                                       PageTableWalkerCache(),
                                                       PageTableWalkerCache())
             else:
-                system.cpu[i].addPrivateSplitL1Caches(L1Cache(size = '32kB'),
-                                                      L1Cache(size = '64kB'))
+                system.cpu[i].addPrivateSplitL1Caches(icache, dcache)
         if options.l2cache:
             system.cpu[i].connectAllPorts(system.tol2bus, system.membus)
         else:
diff -r 68a5b8bba293 -r 842d1dd7adc1 configs/common/Options.py
--- a/configs/common/Options.py	Sat Feb 12 10:14:52 2011 -0500
+++ b/configs/common/Options.py	Fri Feb 18 12:31:40 2011 -0500
@@ -38,13 +38,13 @@
 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)
 
 # Run duration options