changeset 351585c17699 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=351585c17699
description:
ARM: Fix memory starting at non-zero address and exceeding max mem for
a system.
diffstat:
configs/common/FSConfig.py | 3 ++-
configs/example/fs.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diffs (28 lines):
diff -r e29c604a2582 -r 351585c17699 configs/common/FSConfig.py
--- a/configs/common/FSConfig.py Fri Mar 09 15:33:07 2012 -0500
+++ b/configs/common/FSConfig.py Fri Mar 09 16:45:47 2012 -0500
@@ -276,10 +276,11 @@
else:
self.kernel = binary('vmlinux.arm.smp.fb.2.6.38.8')
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 amount of DRAM you've selected. Please try"
print " another platform"
+ sys.exit(1)
boot_flags = 'earlyprintk console=ttyAMA0 lpj=19988480 norandmaps ' + \
'rw loglevel=8 mem=%s root=/dev/sda1' % mdesc.mem()
diff -r e29c604a2582 -r 351585c17699 configs/example/fs.py
--- a/configs/example/fs.py Fri Mar 09 15:33:07 2012 -0500
+++ b/configs/example/fs.py Fri Mar 09 16:45:47 2012 -0500
@@ -157,7 +157,7 @@
else:
mem_size = SysConfig().mem()
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.mem_side = test_sys.membus.slave
else:
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
