summaryrefslogtreecommitdiff
path: root/configs/example/fs.py
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2014-11-18 19:17:29 -0600
committerNilay Vaish <nilay@cs.wisc.edu>2014-11-18 19:17:29 -0600
commit708e80d9bb0577662dd7181d4ae947c2cc9b8ac9 (patch)
tree3394d39be88368c22e5d6d9cc854165059e764a7 /configs/example/fs.py
parentb5fd6050a2f1c3a597ce8e2c7b0f9d78596fc210 (diff)
downloadgem5-708e80d9bb0577662dd7181d4ae947c2cc9b8ac9.tar.xz
configs: small fix to ruby portion of fs.py and se.py
In fs.py the io port controller was being attached to the iobus multiple times. This should be done only once. In se.py, the the option use_map was being set which no longer exists.
Diffstat (limited to 'configs/example/fs.py')
-rw-r--r--configs/example/fs.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/configs/example/fs.py b/configs/example/fs.py
index 727f69339..0277feef3 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -142,6 +142,10 @@ def build_test_system(np):
test_sys.ruby.clk_domain = SrcClockDomain(clock = options.ruby_clock,
voltage_domain = test_sys.voltage_domain)
+ # Connect the ruby io port to the PIO bus,
+ # assuming that there is just one such port.
+ test_sys.iobus.master = test_sys.ruby._io_port.slave
+
for (i, cpu) in enumerate(test_sys.cpu):
#
# Tie the cpu ports to the correct ruby system ports
@@ -161,10 +165,6 @@ def build_test_system(np):
cpu.interrupts.int_master = test_sys.ruby._cpu_ports[i].slave
cpu.interrupts.int_slave = test_sys.ruby._cpu_ports[i].master
- # Connect the ruby io port to the PIO bus,
- # assuming that there is just one such port.
- test_sys.iobus.master = test_sys.ruby._io_port.slave
-
else:
if options.caches or options.l2cache:
# By default the IOCache runs at the system clock