Configs: Stop setting the "mem" parameter in splash2 config files.

This parameter is no longer used, and trying to set it like these scripts were
gives a simobject two parents and causes the simulation to die.

diff --git a/configs/splash2/cluster.py b/configs/splash2/cluster.py
index 77591dc6222e7614a359da264a45fed9e1ffdb82..e8c471eaa7f79754544046d91606297391b9fb3a 100644 (file)
--- a/configs/splash2/cluster.py
+++ b/configs/splash2/cluster.py
@@ -234,7 +234,6 @@ for cluster in clusters:
     for cpu in cluster.cpus:
         cpu.icache_port = cluster.clusterbus.port
         cpu.dcache_port = cluster.clusterbus.port
-        cpu.mem = cluster.l1
 
 # ----------------------
 # Define the root

diff --git a/configs/splash2/run.py b/configs/splash2/run.py
index 24faade17a180f7517d3acaaa99f4729e7e643e2..8d42b3ab814d6619d64360ab337b722a02ccecc4 100644 (file)
--- a/configs/splash2/run.py
+++ b/configs/splash2/run.py
@@ -217,7 +217,6 @@ system.l2.mem_side = system.membus.port
 for cpu in cpus:
     cpu.addPrivateSplitL1Caches(L1(size = options.l1size, assoc = 1),
                                 L1(size = options.l1size, assoc = 4))
-    cpu.mem = cpu.dcache
     # connect cpu level-1 caches to shared level-2 cache
     cpu.connectMemPorts(system.toL2bus)