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/common/FSConfig.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/common/FSConfig.py')
| -rw-r--r-- | configs/common/FSConfig.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index e8cd0083b..04793e98e 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -1,4 +1,4 @@ -# Copyright (c) 2010-2012, 2015-2018 ARM Limited +# Copyright (c) 2010-2012, 2015-2019 ARM Limited # All rights reserved. # # The license below extends only to copyright in the software and shall @@ -206,8 +206,7 @@ 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, - ignore_dtb=False): + external_memory="", ruby=False, security=False): assert machine_type pci_devices = [] @@ -238,10 +237,6 @@ 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 or ignore_dtb): - fatal("No DTB specified and no default DTB known for '%s'" % \ - machine_type) - if isinstance(self.realview, VExpress_EMM64): if os.path.split(mdesc.disk())[-1] == 'linux-aarch32-ael.img': print("Selected 64-bit ARM architecture, updating default " @@ -289,7 +284,7 @@ def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None, # EOT character on UART will end the simulation self.realview.uart[0].end_on_eot = True else: - if dtb_filename and not ignore_dtb: + if dtb_filename: self.dtb_filename = binary(dtb_filename) self.machine_type = machine_type if machine_type in ArmMachineType.map \ |