summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2011-05-04 20:38:28 -0500
committerAli Saidi <Ali.Saidi@ARM.com>2011-05-04 20:38:28 -0500
commitcefd6960e5312c27b613dcb783c66539baa0307d (patch)
tree195c65cbf2f460012ca16863afca2946809afdf7
parent42e788885573d2294877c73f83dbf539e4bac10f (diff)
downloadgem5-cefd6960e5312c27b613dcb783c66539baa0307d.tar.xz
ARM: Configure bootloader parameters
-rw-r--r--configs/common/FSConfig.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 8ab06a5d0..907a5ce0a 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -235,6 +235,13 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False):
self.physmem = PhysicalMemory(range = AddrRange(Addr('256MB')),
zero = True)
boot_flags += "mem=256MB root=/dev/sda1 "
+ self.nvmem = PhysicalMemory(range = AddrRange(Addr('2GB'),
+ size = '64MB'), zero = True)
+ self.nvmem.port = self.membus.port
+ self.boot_loader = binary('boot.arm')
+ self.boot_loader_mem = self.nvmem
+ self.gic_cpu_addr = self.realview.gic.cpu_addr
+ self.flags_addr = self.realview.realview_io.pio_addr + 0x30
else:
self.physmem = PhysicalMemory(range = AddrRange(Addr('128MB')),
zero = True)
@@ -244,6 +251,7 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False):
self.diskmem.port = self.membus.port
boot_flags += "mem=128MB slram=slram0,0x8000000,+0x8000000 " + \
"mtdparts=slram0:- root=/dev/mtdblock0 "
+
if mdesc.disk().count('android'):
boot_flags += "init=/init "
self.boot_osflags = boot_flags