diff options
| author | Ciro Santilli <ciro.santilli@arm.com> | 2019-11-18 15:30:49 +0000 |
|---|---|---|
| committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2020-01-31 12:41:49 +0000 |
| commit | a29aaa364b70a227ea0784f64e4082e08ce233a1 (patch) | |
| tree | a82dd9b1db4906b1308465497ae0d32c2f5e26e5 /configs/common | |
| parent | ee704209b31d3273e703509cb1573da10d52029d (diff) | |
| download | gem5-a29aaa364b70a227ea0784f64e4082e08ce233a1.tar.xz | |
config: add --bootloader to fs.py and fs_bigLITTLE.py
This allows explicitly selecting which bootloader to use.
Before this commit, the bootloader had a fixed basename which
had to be present inside M5_PATH.
Change-Id: I02919207d6f175854017ae7b603d811da63d618e
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23670
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'configs/common')
| -rw-r--r-- | configs/common/FSConfig.py | 4 | ||||
| -rw-r--r-- | configs/common/Options.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index ecc5f1c82..e218c14c5 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -221,7 +221,7 @@ def makeSparcSystem(mem_mode, mdesc=None, cmdline=None): def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None, dtb_filename=None, bare_metal=False, cmdline=None, external_memory="", ruby=False, security=False, - vio_9p=None): + vio_9p=None, bootloader=None): assert machine_type pci_devices = [] @@ -312,7 +312,7 @@ def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None, 'lpj=19988480 norandmaps rw loglevel=8 ' + \ 'mem=%(mem)s root=%(rootdev)s' - self.realview.setupBootLoader(self, binary) + self.realview.setupBootLoader(self, binary, bootloader) if hasattr(self.realview.gic, 'cpu_addr'): self.gic_cpu_addr = self.realview.gic.cpu_addr diff --git a/configs/common/Options.py b/configs/common/Options.py index 173bd483c..1405012d6 100644 --- a/configs/common/Options.py +++ b/configs/common/Options.py @@ -444,6 +444,8 @@ def addFSOptions(parser): action="store_true", help="Enable stats dump at context "\ "switches and dump tasks file (required for Streamline)") parser.add_option("--vio-9p", action="store_true", help=vio_9p_help) + parser.add_option("--bootloader", action='append', + help="executable file that runs before the --kernel") # Benchmark options parser.add_option("--dual", action="store_true", |