ARM: Fix memory starting at non-zero address and exceeding max mem for a system.
This commit is contained in:
parent
470051345a
commit
d2a0db7fe9
2 changed files with 3 additions and 2 deletions
|
@ -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()
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue