summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jermar <jakub@jermar.eu>2016-07-19 09:52:46 -0500
committerJakub Jermar <jakub@jermar.eu>2016-07-19 09:52:46 -0500
commit86a25bbcee88f6e69299867b6264885d738f636e (patch)
treeeaa00e8668a6c567258e68449225e16ed6ac8b82
parentc7bf0e9cdd8f22139919efd7d81824c988e4f41a (diff)
downloadgem5-86a25bbcee88f6e69299867b6264885d738f636e.tar.xz
config: Allow SPARC FS image to be specified on the command line
At the moment the SPARC FS machine configuration comes with a hardcoded value for using the Solaris 10 disk image from the OpenSPARC tarball. The --disk-image option is completely ignored for SPARC. This simple patch modifies the behavior so that --disk-image option is both taken into account and also required. This makes it possible to easily change SPARC FS images without having to modify the configuration files.
-rw-r--r--configs/common/FSConfig.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 0b47fbb4c..e6dcac8a4 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -169,7 +169,7 @@ def makeSparcSystem(mem_mode, mdesc=None, cmdline=None):
self.partition_desc.port = self.membus.master
self.intrctrl = IntrControl()
self.disk0 = CowMmDisk()
- self.disk0.childImage(disk('disk.s10hw2'))
+ self.disk0.childImage(mdesc.disk())
self.disk0.pio = self.iobus.master
# The puart0 and hvuart are placed on the IO bus, so create ranges