diff options
| author | Anthony Gutierrez <atgutier@umich.edu> | 2013-02-15 18:48:59 -0500 |
|---|---|---|
| committer | Anthony Gutierrez <atgutier@umich.edu> | 2013-02-15 18:48:59 -0500 |
| commit | 21aa950318c3f754797e1aab3533f749559e7e87 (patch) | |
| tree | 8770eaa7513750c0fd617479e95b3acf43583f76 /configs | |
| parent | f7107fb7954b45547ab792493e86760cf6fe33ed (diff) | |
| download | gem5-21aa950318c3f754797e1aab3533f749559e7e87.tar.xz | |
options: add command line option for dtb file
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/common/FSConfig.py | 5 | ||||
| -rw-r--r-- | configs/common/Options.py | 3 | ||||
| -rw-r--r-- | configs/example/fs.py | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index fb3a5408f..99b5c7967 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -227,7 +227,8 @@ def makeSparcSystem(mem_mode, mdesc = None): return self -def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False): +def makeArmSystem(mem_mode, machine_type, mdesc = None, dtb_filename = None, + bare_metal=False): assert machine_type if bare_metal: @@ -279,6 +280,8 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False): self.mem_ranges = [self.physmem.range] else: self.kernel = binary('vmlinux.arm.smp.fb.2.6.38.8') + if dtb_filename is not None: + self.dtb_filename = dtb_filename self.machine_type = machine_type if convert.toMemorySize(mdesc.mem()) > int(self.realview.max_mem_size): print "The currently selected ARM platforms doesn't support" diff --git a/configs/common/Options.py b/configs/common/Options.py index 63951950f..bdc0a8c30 100644 --- a/configs/common/Options.py +++ b/configs/common/Options.py @@ -173,6 +173,9 @@ def addFSOptions(parser): help="Provide the raw system without the linux specific bits") parser.add_option("--machine-type", action="store", type="choice", choices=ArmMachineType.map.keys(), default="RealView_PBX") + parser.add_option("--dtb-filename", action="store", type="string", + help="Specifies device tree blob file to use with device-tree-"\ + "enabled kernels") # Benchmark options parser.add_option("--dual", action="store_true", help="Simulate two systems attached with an ethernet link") diff --git a/configs/example/fs.py b/configs/example/fs.py index b938cb96c..73b0acbfb 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -101,9 +101,8 @@ elif buildEnv['TARGET_ISA'] == "sparc": elif buildEnv['TARGET_ISA'] == "x86": test_sys = makeLinuxX86System(test_mem_mode, options.num_cpus, bm[0]) elif buildEnv['TARGET_ISA'] == "arm": - test_sys = makeArmSystem(test_mem_mode, - options.machine_type, bm[0], - bare_metal=options.bare_metal) + test_sys = makeArmSystem(test_mem_mode, options.machine_type, bm[0], + options.dtb_filename, bare_metal=options.bare_metal) else: fatal("Incapable of building %s full system!", buildEnv['TARGET_ISA']) |