summaryrefslogtreecommitdiff
path: root/configs/common
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2010-11-08 13:58:24 -0600
committerAli Saidi <Ali.Saidi@ARM.com>2010-11-08 13:58:24 -0600
commitc779af4e1295c9649ffbbd297ed535bead1cc885 (patch)
tree798169822fd581c304eaf62cf490fdd220c80a27 /configs/common
parentea1167dd9fa60f862f8879a5de66938e617e0ce0 (diff)
downloadgem5-c779af4e1295c9649ffbbd297ed535bead1cc885.tar.xz
Mem: Finish half-baked support for mmaping file in physmem.
Physmem has a parameter to be able to mem map a file, however it isn't actually used. This changeset utilizes the parameter so a file can be mmapped.
Diffstat (limited to 'configs/common')
-rw-r--r--configs/common/FSConfig.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 6509490d7..fe57b5cab 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -200,9 +200,12 @@ def makeLinuxArmSystem(mem_mode, mdesc = None, bare_metal=False,
self.membus.badaddr_responder.warn_access = "warn"
self.bridge = Bridge(delay='50ns', nack_delay='4ns')
self.physmem = PhysicalMemory(range = AddrRange(mdesc.mem()), zero = True)
+ self.diskmem = PhysicalMemory(range = AddrRange(Addr('128MB'), size = '128MB'),
+ file = disk('ael-arm.ext2'))
self.bridge.side_a = self.iobus.port
self.bridge.side_b = self.membus.port
self.physmem.port = self.membus.port
+ self.diskmem.port = self.membus.port
self.mem_mode = mem_mode
@@ -224,7 +227,10 @@ def makeLinuxArmSystem(mem_mode, mdesc = None, bare_metal=False,
self.intrctrl = IntrControl()
self.terminal = Terminal()
- self.boot_osflags = 'earlyprintk mem=128MB console=ttyAMA0 lpj=19988480 norandmaps'
+ self.kernel = binary('vmlinux.arm')
+ self.boot_osflags = 'earlyprintk mem=128MB console=ttyAMA0 lpj=19988480' + \
+ ' norandmaps slram=slram0,0x8000000,+0x8000000' + \
+ ' mtdparts=slram0:- rw loglevel=8 root=/dev/mtdblock0'
return self