summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Gutierrez <atgutier@umich.edu>2015-01-03 17:51:48 -0600
committerAnthony Gutierrez <atgutier@umich.edu>2015-01-03 17:51:48 -0600
commit0d8d6e44419e2c5464012b66abc62aaad433026b (patch)
tree919aa24de5622f48286f75a5119ee33c71d710cd
parent6d3200440702719356ee337fc7f24075cdb75224 (diff)
downloadgem5-0d8d6e44419e2c5464012b66abc62aaad433026b.tar.xz
arm: fix build_drive_system when not using default options
when trying to dual boot on arm build_drive_system will only use the default values for the dtb file, number of processors, and disk image. if you are using the non-default files by passing values on the command line for example, or by making a new entry in Benchmarks.py, the build config scripts will still look for the default files. this will lead to the wrong system files being used, or the simulator will fail if you do not have them. Committed by: Nilay Vaish <nilay@cs.wisc.edu>
-rw-r--r--configs/example/fs.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/example/fs.py b/configs/example/fs.py
index 6fa0f8a11..9609b25a2 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -236,8 +236,8 @@ def build_drive_system(np):
drive_sys = makeLinuxX86System(drive_mem_mode, np, bm[1],
cmdline=cmdline)
elif buildEnv['TARGET_ISA'] == 'arm':
- drive_sys = makeArmSystem(drive_mem_mode, options.machine_type, bm[1],
- cmdline=cmdline)
+ drive_sys = makeArmSystem(drive_mem_mode, options.machine_type, np,
+ bm[1], options.dtb_filename, cmdline=cmdline)
# Create a top-level voltage domain
drive_sys.voltage_domain = VoltageDomain(voltage = options.sys_voltage)