diff options
author | Steve Reinhardt <stever@gmail.com> | 2007-08-03 03:51:30 -0400 |
---|---|---|
committer | Steve Reinhardt <stever@gmail.com> | 2007-08-03 03:51:30 -0400 |
commit | 3afc6259757e8ec688701bf3e3d7fcdad28d5b6c (patch) | |
tree | 35c0e1ebb596dfe94934fc0f5f064eb523b3013b /configs | |
parent | 62aa1d7f559622dcb04b1b2fe1e2ecec375883a3 (diff) | |
parent | 121a894ce0d551e860392f9aa6bd381329a25b96 (diff) | |
download | gem5-3afc6259757e8ec688701bf3e3d7fcdad28d5b6c.tar.xz |
merge from head
--HG--
extra : convert_revision : 21f7afe2719c00744c0981212c1ee6e442238e01
Diffstat (limited to 'configs')
-rw-r--r-- | configs/example/fs.py | 3 | ||||
-rw-r--r-- | configs/example/se.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/configs/example/fs.py b/configs/example/fs.py index 76c12bd9e..e772a3ab1 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -134,6 +134,9 @@ if len(bm) == 2: drive_sys = makeSparcSystem(drive_mem_mode, bm[1]) drive_sys.cpu = DriveCPUClass(cpu_id=0) drive_sys.cpu.connectMemPorts(drive_sys.membus) + if options.kernel is not None: + drive_sys.kernel = binary(options.kernel) + root = makeDualRoot(test_sys, drive_sys, options.etherdump) elif len(bm) == 1: root = Root(system=test_sys) diff --git a/configs/example/se.py b/configs/example/se.py index b294480f6..20fe75a21 100644 --- a/configs/example/se.py +++ b/configs/example/se.py @@ -64,7 +64,7 @@ if args: process = LiveProcess() process.executable = options.cmd -process.cmd = options.cmd + " " + options.options +process.cmd = [options.cmd] + options.options.split() if options.input != "": process.input = options.input |