summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-08-02 15:14:36 -0700
committerGabe Black <gblack@eecs.umich.edu>2007-08-02 15:14:36 -0700
commitfa9e4d110aba05fb860e299d1765249589e9b810 (patch)
tree2b2aaac3026d0b540f1557f273febfb5db5069b1 /configs
parent4af5740afdbd10fc4e8f9370d7b5ad49642c20e4 (diff)
parent4041e1ddd98ce0d3e21714b5830ac5f3e66c3765 (diff)
downloadgem5-fa9e4d110aba05fb860e299d1765249589e9b810.tar.xz
Merge with head.
--HG-- extra : convert_revision : 7700f475caa676948175cdf126ee018b0c4ad35c
Diffstat (limited to 'configs')
-rw-r--r--configs/example/fs.py3
1 files changed, 3 insertions, 0 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)