summaryrefslogtreecommitdiff
path: root/configs/common/FSConfig.py
diff options
context:
space:
mode:
authorGlenn Bergmans <glenn.bergmans@arm.com>2016-03-14 20:29:12 +0000
committerCurtis Dunham <curtis.dunham@arm.com>2018-01-29 22:22:51 +0000
commitdcab5b577e35f9bf9969ccfd91309455758aaed8 (patch)
tree2ef530467a6d67caa152af3572b309f41146b67e /configs/common/FSConfig.py
parent7c9122b6f2365bae51903f125ccaa9c4b779ea26 (diff)
downloadgem5-dcab5b577e35f9bf9969ccfd91309455758aaed8.tar.xz
config: Embed Device Tree generation in fs.py config
Equips the fs.py config routine with an extra commandline option --generate-dtb that will generate a dtb file automatically before running the simulation. Only works with ARM systems and gives a warning if the simulated system is not of --machine-type VExpress_GEM5_V1. Change-Id: I7766e5459fd9bec2245de83cef103091ebaf7229 Reviewed-by: Curtis Dunham <curtis.dunham@arm.com> Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-on: https://gem5-review.googlesource.com/5968 Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'configs/common/FSConfig.py')
-rw-r--r--configs/common/FSConfig.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index c08353a23..fc8765b6c 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -204,7 +204,8 @@ 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):
+ external_memory="", ruby=False, security=False,
+ ignore_dtb=False):
assert machine_type
default_dtbs = {
@@ -249,7 +250,7 @@ def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None,
machine_type = platform_class.__name__
self.realview = platform_class()
- if not dtb_filename and not bare_metal:
+ if not dtb_filename and not (bare_metal or ignore_dtb):
try:
dtb_filename = default_dtbs[machine_type]
except KeyError:
@@ -305,7 +306,7 @@ def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None,
if machine_type in default_kernels:
self.kernel = binary(default_kernels[machine_type])
- if dtb_filename:
+ if dtb_filename and not ignore_dtb:
self.dtb_filename = binary(dtb_filename)
self.machine_type = machine_type if machine_type in ArmMachineType.map \