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/example/arm/fs_bigLITTLE.py | |
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/example/arm/fs_bigLITTLE.py')
-rw-r--r-- | configs/example/arm/fs_bigLITTLE.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/configs/example/arm/fs_bigLITTLE.py b/configs/example/arm/fs_bigLITTLE.py index 4645d9ee8..969a84488 100644 --- a/configs/example/arm/fs_bigLITTLE.py +++ b/configs/example/arm/fs_bigLITTLE.py @@ -117,7 +117,7 @@ class Ex5LittleCluster(devices.CpuCluster): cpu_voltage, *cpu_config) def createSystem(caches, kernel, bootscript, machine_type="VExpress_GEM5", - disks=[], mem_size=default_mem_size): + disks=[], mem_size=default_mem_size, bootloader=None): platform = ObjectList.platform_list.get(machine_type) m5.util.inform("Simulated platform: %s", platform.__name__) @@ -144,7 +144,7 @@ def createSystem(caches, kernel, bootscript, machine_type="VExpress_GEM5", for dev in sys.pci_vio_block: sys.attach_pci(dev) - sys.realview.setupBootLoader(sys, SysPaths.binary) + sys.realview.setupBootLoader(sys, SysPaths.binary, bootloader) return sys @@ -203,6 +203,8 @@ def addOptions(parser): help="System memory size") parser.add_argument("--kernel-cmd", type=str, default=None, help="Custom Linux kernel command") + parser.add_argument("--bootloader", action="append", + help="executable file that runs before the --kernel") parser.add_argument("-P", "--param", action="append", default=[], help="Set a SimObject parameter relative to the root node. " "An extended Python multi range slicing syntax can be used " @@ -239,7 +241,8 @@ def build(options): options.bootscript, options.machine_type, disks=disks, - mem_size=options.mem_size) + mem_size=options.mem_size, + bootloader=options.bootloader) root.system = system if options.kernel_cmd: |