summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2012-03-09 16:45:47 -0500
committerAli Saidi <saidi@eecs.umich.edu>2012-03-09 16:45:47 -0500
commitd2a0db7fe971f4153fee2fbf57c550ea59c246fd (patch)
treea0944cda22e1c05c81ecd56390a0506fcb68bb1a
parent470051345af2a78425730bd790000530b1b8a1f5 (diff)
downloadgem5-d2a0db7fe971f4153fee2fbf57c550ea59c246fd.tar.xz
ARM: Fix memory starting at non-zero address and exceeding max mem for a system.
-rw-r--r--configs/common/FSConfig.py3
-rw-r--r--configs/example/fs.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 85dfb10f4..5ae36791c 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -276,10 +276,11 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False):
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 --git a/configs/example/fs.py b/configs/example/fs.py
index b3d607a1b..98e5147fc 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -157,7 +157,7 @@ if bm[0]:
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: