diff options
| author | Ali Saidi <Ali.Saidi@ARM.com> | 2012-01-09 18:08:20 -0600 |
|---|---|---|
| committer | Ali Saidi <Ali.Saidi@ARM.com> | 2012-01-09 18:08:20 -0600 |
| commit | bcb71963ebb3c226f4f36f6d5907c6fb3bc10b64 (patch) | |
| tree | 3060f47740cf43f5819dd3496e5e56a2a872fe9c /configs | |
| parent | 8d757038b53e04cf3048af3b2dcebe962f5c33f1 (diff) | |
| download | gem5-bcb71963ebb3c226f4f36f6d5907c6fb3bc10b64.tar.xz | |
ARM: Add support for running multiple systems
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/common/FSConfig.py | 9 | ||||
| -rw-r--r-- | configs/example/fs.py | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index 3e0a3df2e..f54d63852 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -483,6 +483,15 @@ def makeDualRoot(testSystem, driveSystem, dumpfile): self.etherlink.int0 = Parent.testsys.tsunami.ethernet.interface self.etherlink.int1 = Parent.drivesys.tsunami.ethernet.interface + if hasattr(testSystem, 'realview'): + self.etherlink.int0 = Parent.testsys.realview.ethernet.interface + self.etherlink.int1 = Parent.drivesys.realview.ethernet.interface + elif hasattr(testSystem, 'tsunami'): + self.etherlink.int0 = Parent.testsys.tsunami.ethernet.interface + self.etherlink.int1 = Parent.drivesys.tsunami.ethernet.interface + else: + fatal("Don't know how to connect these system together") + if dumpfile: self.etherdump = EtherDump(file=dumpfile) self.etherlink.dump = Parent.etherdump diff --git a/configs/example/fs.py b/configs/example/fs.py index 8ae8d8310..05e35c4ba 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -192,8 +192,8 @@ if len(bm) == 2: elif buildEnv['TARGET_ISA'] == 'x86': drive_sys = makeX86System(drive_mem_mode, np, bm[1]) elif buildEnv['TARGET_ISA'] == 'arm': - drive_sys = makeArmSystem(drive_mem_mode, - machine_options.machine_type, bm[1]) + drive_sys = makeArmSystem(drive_mem_mode, options.machine_type, bm[1]) + drive_sys.cpu = DriveCPUClass(cpu_id=0) drive_sys.cpu.connectAllPorts(drive_sys.membus) if options.fastmem: |