diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-03-05 11:00:44 +0000 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-03-05 11:00:44 +0000 |
| commit | 6a19b64de2044e5b166a9883be6531166cd69900 (patch) | |
| tree | e463581d5611ac0a2223a292cc4d1231f3de6b1f /configs | |
| parent | 5498d5298577c07189ff3f7026eba5c1ee09cc1b (diff) | |
| parent | ba042842c61339e33c0b684f9854e8fe818160fe (diff) | |
| download | gem5-6a19b64de2044e5b166a9883be6531166cd69900.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86
--HG--
extra : convert_revision : b585cea2221377eb2fceea8976c46a17c0034f51
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/common/FSConfig.py | 7 | ||||
| -rw-r--r-- | configs/common/cpu2000.py | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index 2b13388d6..da35698f2 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -96,6 +96,7 @@ def makeSparcSystem(mem_mode, mdesc = None): self.membus = Bus(bus_id=1) self.bridge = Bridge() self.t1000 = T1000() + self.t1000.attachOnChipIO(self.membus) self.t1000.attachIO(self.iobus) self.physmem = PhysicalMemory(range = AddrRange(Addr('1MB'), size = '64MB'), zero = True) self.physmem2 = PhysicalMemory(range = AddrRange(Addr('2GB'), size ='256MB'), zero = True) @@ -111,9 +112,9 @@ def makeSparcSystem(mem_mode, mdesc = None): self.disk0 = CowMmDisk() self.disk0.childImage(disk('disk.s10hw2')) self.disk0.pio = self.iobus.port - self.reset_bin = binary('reset.bin') - self.hypervisor_bin = binary('q.bin') - self.openboot_bin = binary('openboot.bin') + self.reset_bin = binary('reset_new.bin') + self.hypervisor_bin = binary('q_new.bin') + self.openboot_bin = binary('openboot_new.bin') self.nvram_bin = binary('nvram1') self.hypervisor_desc_bin = binary('1up-hv.bin') self.partition_desc_bin = binary('1up-md.bin') diff --git a/configs/common/cpu2000.py b/configs/common/cpu2000.py index ca91fd1c0..59799eb49 100644 --- a/configs/common/cpu2000.py +++ b/configs/common/cpu2000.py @@ -621,6 +621,8 @@ class vortex(Benchmark): def __init__(self, isa, os, input_set): if isa == 'alpha': self.endian = 'lendian' + elif (isa == 'sparc' or isa == 'sparc32'): + self.endian = 'bendian' else: raise AttributeError, "unknown ISA %s" % isa |