sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: Fix memory starting at non-zero address and exceeding max mem for a system.

Browse source
This commit is contained in:
Ali Saidi 2012-03-09 16:45:47 -05:00
parent 470051345a
commit d2a0db7fe9
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configs/common/FSConfig.py
View file

@ -276,10 +276,11 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False):
else: else:
self.kernel = binary('vmlinux.arm.smp.fb.2.6.38.8') self.kernel = binary('vmlinux.arm.smp.fb.2.6.38.8')
self.machine_type = machine_type self.machine_type = machine_type
if convert.toMemorySize(mdesc.mem()) > self.realview.max_mem_size: if convert.toMemorySize(mdesc.mem()) > int(self.realview.max_mem_size):
print "The currently selected ARM platforms doesn't support" print "The currently selected ARM platforms doesn't support"
print " the amount of DRAM you've selected. Please try" print " the amount of DRAM you've selected. Please try"
print " another platform" print " another platform"
sys.exit(1)
boot_flags = 'earlyprintk console=ttyAMA0 lpj=19988480 norandmaps ' + \ boot_flags = 'earlyprintk console=ttyAMA0 lpj=19988480 norandmaps ' + \
'rw loglevel=8 mem=%s root=/dev/sda1' % mdesc.mem() 'rw loglevel=8 mem=%s root=/dev/sda1' % mdesc.mem()

2
configs/example/fs.py
View file

@ -157,7 +157,7 @@ if bm[0]:
else: else:
mem_size = SysConfig().mem() mem_size = SysConfig().mem()
if options.caches or options.l2cache: if options.caches or options.l2cache:
test_sys.iocache = IOCache(addr_ranges=[mem_size]) test_sys.iocache = IOCache(addr_ranges=[test_sys.physmem.range])
test_sys.iocache.cpu_side = test_sys.iobus.master test_sys.iocache.cpu_side = test_sys.iobus.master
test_sys.iocache.mem_side = test_sys.membus.slave test_sys.iocache.mem_side = test_sys.membus.slave
else: else: