diff options
| -rw-r--r-- | configs/common/FSConfig.py | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index e4babbcb6..e8cd0083b 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -210,18 +210,6 @@ def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None, ignore_dtb=False): assert machine_type - default_dtbs = { - "RealViewPBX": None, - "VExpress_EMM": "vexpress.aarch32.ll_20131205.0-gem5.%dcpu.dtb" % num_cpus, - "VExpress_EMM64": "vexpress.aarch64.20140821.dtb", - } - - default_kernels = { - "RealViewPBX": "vmlinux.arm.smp.fb.2.6.38.8", - "VExpress_EMM": "vmlinux.aarch32.ll_20131205.0-gem5", - "VExpress_EMM64": "vmlinux.aarch64.20140821", - } - pci_devices = [] if bare_metal: @@ -251,11 +239,8 @@ def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None, self.realview = platform_class() if not dtb_filename and not (bare_metal or ignore_dtb): - try: - dtb_filename = default_dtbs[machine_type] - except KeyError: - fatal("No DTB specified and no default DTB known for '%s'" % \ - machine_type) + 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': @@ -304,9 +289,6 @@ 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 machine_type in default_kernels: - self.kernel = binary(default_kernels[machine_type]) - if dtb_filename and not ignore_dtb: self.dtb_filename = binary(dtb_filename) |