diff options
| author | Ciro Santilli <ciro.santilli@arm.com> | 2019-01-24 14:13:39 +0000 |
|---|---|---|
| committer | Ciro Santilli <ciro.santilli@arm.com> | 2019-01-25 13:06:16 +0000 |
| commit | 9048ef0ffbf21bedb803b785fb68f83e95c04db8 (patch) | |
| tree | 368235389acf7b5115cf2172d12542b4b3c1df95 /configs/example/fs.py | |
| parent | 12eca7ac04ae1ba559bf322b5c625513929d369d (diff) | |
| download | gem5-9048ef0ffbf21bedb803b785fb68f83e95c04db8.tar.xz | |
configs: fs.py remove --generate-dtb and enable it by default
The option is now enabled if neither --bare-metal nor --dtb-filename are
given.
This is what fs_bigLITTLE.py already did before this patch.
Change-Id: I9179f8c9fa18edbd1e0f1a65ea2c1de0a26b7921
Reviewed-on: https://gem5-review.googlesource.com/c/15899
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'configs/example/fs.py')
| -rw-r--r-- | configs/example/fs.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/configs/example/fs.py b/configs/example/fs.py index 3fdf151c9..4d2165884 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -1,4 +1,4 @@ -# Copyright (c) 2010-2013, 2016 ARM Limited +# Copyright (c) 2010-2013, 2016, 2019 ARM Limited # All rights reserved. # # The license below extends only to copyright in the software and shall @@ -95,7 +95,6 @@ def build_test_system(np): options.num_cpus, bm[0], options.dtb_filename, bare_metal=options.bare_metal, cmdline=cmdline, - ignore_dtb=options.generate_dtb, external_memory= options.external_memory_system, ruby=options.ruby, @@ -241,8 +240,7 @@ def build_drive_system(np): cmdline=cmdline) elif buildEnv['TARGET_ISA'] == 'arm': drive_sys = makeArmSystem(drive_mem_mode, options.machine_type, np, - bm[1], options.dtb_filename, cmdline=cmdline, - ignore_dtb=options.generate_dtb) + bm[1], options.dtb_filename, cmdline=cmdline) # Create a top-level voltage domain drive_sys.voltage_domain = VoltageDomain(voltage = options.sys_voltage) @@ -354,12 +352,8 @@ if options.timesync: if options.frame_capture: VncServer.frame_capture = True -if buildEnv['TARGET_ISA'] == "arm" and options.generate_dtb: - # Sanity checks - if options.dtb_filename: - fatal("--generate-dtb and --dtb-filename cannot be specified at the"\ - "same time.") - +if buildEnv['TARGET_ISA'] == "arm" and not options.bare_metal \ + and not options.dtb_filename: if options.machine_type not in ["VExpress_GEM5", "VExpress_GEM5_V1"]: warn("Can only correctly generate a dtb for VExpress_GEM5_V1 " \ "platforms, unless custom hardware models have been equipped "\ |