From: Ali Saidi <saidi@eecs.umich.edu>
Date: Fri, 9 Mar 2012 21:45:47 +0000 (-0500)
Subject: ARM: Fix memory starting at non-zero address and exceeding max mem for a system.
X-Git-Tag: stable_2012_06_28~179
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d2a0db7fe971f4153fee2fbf57c550ea59c246fd;p=gem5.git

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

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: