diff options
| -rw-r--r-- | configs/common/FSConfig.py | 8 | ||||
| -rw-r--r-- | configs/example/ruby_fs.py | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index f1c905fd8..72cfcbb55 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -79,14 +79,14 @@ def makeLinuxAlphaSystem(mem_mode, mdesc = None): return self -def makeLinuxAlphaRubySystem(mem_mode, phys_mem, mdesc = None): +def makeLinuxAlphaRubySystem(mem_mode, mdesc = None): class BaseTsunami(Tsunami): ethernet = NSGigE(pci_bus=0, pci_dev=1, pci_func=0) ide = IdeController(disks=[Parent.disk0, Parent.disk2], pci_func=0, pci_dev=0, pci_bus=0) - - self = LinuxAlphaSystem(physmem = phys_mem) + physmem = PhysicalMemory(range = AddrRange(mdesc.mem())) + self = LinuxAlphaSystem(physmem = physmem) if not mdesc: # generic system mdesc = SysConfig() @@ -100,7 +100,7 @@ def makeLinuxAlphaRubySystem(mem_mode, phys_mem, mdesc = None): # RubyPort currently does support functional accesses. Therefore provide # the piobus a direct connection to physical memory # - self.piobus.port = phys_mem.port + self.piobus.port = physmem.port self.disk0 = CowIdeDisk(driveID='master') self.disk2 = CowIdeDisk(driveID='master') diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py index 33f2fd0e5..5c508f6fe 100644 --- a/configs/example/ruby_fs.py +++ b/configs/example/ruby_fs.py @@ -116,12 +116,10 @@ FutureClass = None CPUClass.clock = options.clock -physmem = PhysicalMemory() - -system = makeLinuxAlphaRubySystem(test_mem_mode, physmem, bm[0]) +system = makeLinuxAlphaRubySystem(test_mem_mode, bm[0]) system.ruby = Ruby.create_system(options, - physmem, + system.physmem, system.piobus, system.dma_devices) |