From: Anthony Gutierrez Date: Sat, 3 Jan 2015 23:51:48 +0000 (-0600) Subject: arm: fix build_drive_system when not using default options X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0d8d6e44419e2c5464012b66abc62aaad433026b;p=gem5.git 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 --- 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)