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.
This commit is contained in:
parent
b5fd6050a2
commit
708e80d9bb
2 changed files with 4 additions and 5 deletions
|
@ -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
|
||||
|
|
|
@ -225,7 +225,6 @@ if options.ruby:
|
|||
print >> sys.stderr, "Ruby requires TimingSimpleCPU or O3CPU!!"
|
||||
sys.exit(1)
|
||||
|
||||
options.use_map = True
|
||||
Ruby.create_system(options, False, system)
|
||||
assert(options.num_cpus == len(system.ruby._cpu_ports))
|
||||
|
||||
|
|
Loading…
Reference in a new issue