diff options
| author | Ali Saidi <Ali.Saidi@ARM.com> | 2011-02-23 15:10:48 -0600 |
|---|---|---|
| committer | Ali Saidi <Ali.Saidi@ARM.com> | 2011-02-23 15:10:48 -0600 |
| commit | 79dac89552e7ef0fa4376ba028b10ad7d2f1ca69 (patch) | |
| tree | d4f274c7f23254dd339ca0ac0c86d154327c582e /configs/common | |
| parent | e2a6275c037c6be1bad1f876aa7fbaf3864e9e53 (diff) | |
| download | gem5-79dac89552e7ef0fa4376ba028b10ad7d2f1ca69.tar.xz | |
ARM: Clarifies creation of Linux and baremetal ARM systems.
makeArmSystem creates both bare-metal and Linux systems more cleanly.
machine_type was never optional though listed as an optional argument; a system
such as "RealView_PBX" must now be explicitly specified. Now that it is a
required argument, the placement of the arguments has changed slightly
requiring some changes to calls that create ARM systems.
Diffstat (limited to 'configs/common')
| -rw-r--r-- | configs/common/FSConfig.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index f58fd3d2e..2c6696ea7 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -184,8 +184,9 @@ def makeSparcSystem(mem_mode, mdesc = None): return self -def makeLinuxArmSystem(mem_mode, mdesc = None, bare_metal=False, - machine_type = None): +def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False): + assert machine_type + if bare_metal: self = ArmSystem() else: @@ -228,10 +229,15 @@ def makeLinuxArmSystem(mem_mode, mdesc = None, bare_metal=False, print "Unknown Machine Type" sys.exit(1) - if not bare_metal and machine_type: - self.machine_type = machine_type - elif bare_metal: + if bare_metal: + # EOT character on UART will end the simulation self.realview.uart.end_on_eot = True + else: + self.machine_type = machine_type + 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' self.realview.attachOnChipIO(self.membus) self.realview.attachIO(self.iobus) @@ -239,10 +245,6 @@ def makeLinuxArmSystem(mem_mode, mdesc = None, bare_metal=False, self.intrctrl = IntrControl() self.terminal = Terminal() self.vncserver = VncServer() - 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 |