changeset bb6411d45356 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=bb6411d45356
description:
config: fixed minor bug connecting dma devices to ruby
diffstat:
configs/common/FSConfig.py | 3 +++
configs/example/ruby_fs.py | 12 +++++-------
2 files changed, 8 insertions(+), 7 deletions(-)
diffs (41 lines):
diff -r 9c245e375e05 -r bb6411d45356 configs/common/FSConfig.py
--- a/configs/common/FSConfig.py Tue Feb 08 07:47:02 2011 -0600
+++ b/configs/common/FSConfig.py Tue Feb 08 15:52:44 2011 -0800
@@ -334,6 +334,9 @@
# Create and connect the busses required by each memory system
if Ruby:
connectX86RubySystem(self)
+ # add the ide to the list of dma devices that later need to attach to
+ # dma controllers
+ self._dma_devices = [self.pc.south_bridge.ide]
else:
connectX86ClassicSystem(self)
diff -r 9c245e375e05 -r bb6411d45356 configs/example/ruby_fs.py
--- a/configs/example/ruby_fs.py Tue Feb 08 07:47:02 2011 -0600
+++ b/configs/example/ruby_fs.py Tue Feb 08 15:52:44 2011 -0800
@@ -111,19 +111,17 @@
if buildEnv['TARGET_ISA'] == "alpha":
system = makeLinuxAlphaRubySystem(test_mem_mode, bm[0])
- system.ruby = Ruby.create_system(options,
- system,
- system.piobus,
- system.dma_devices)
elif buildEnv['TARGET_ISA'] == "x86":
system = makeLinuxX86System(test_mem_mode, options.num_cpus, bm[0], True)
setWorkCountOptions(system, options)
- system.ruby = Ruby.create_system(options,
- system,
- system.piobus)
else:
fatal("incapable of building non-alpha or non-x86 full system!")
+system.ruby = Ruby.create_system(options,
+ system,
+ system.piobus,
+ system._dma_devices)
+
system.cpu = [CPUClass(cpu_id=i) for i in xrange(options.num_cpus)]
for (i, cpu) in enumerate(system.cpu):
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
