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.
This commit is contained in:
Jakub Jermar 2016-07-19 09:52:46 -05:00
parent c7bf0e9cdd
commit 86a25bbcee

View file

@ -169,7 +169,7 @@ def makeSparcSystem(mem_mode, mdesc=None, cmdline=None):
self.partition_desc.port = self.membus.master self.partition_desc.port = self.membus.master
self.intrctrl = IntrControl() self.intrctrl = IntrControl()
self.disk0 = CowMmDisk() self.disk0 = CowMmDisk()
self.disk0.childImage(disk('disk.s10hw2')) self.disk0.childImage(mdesc.disk())
self.disk0.pio = self.iobus.master self.disk0.pio = self.iobus.master
# The puart0 and hvuart are placed on the IO bus, so create ranges # The puart0 and hvuart are placed on the IO bus, so create ranges