FSConfig.py (12079:a5cc6df83fcf) FSConfig.py (12475:c6a23d6370de)
1# Copyright (c) 2010-2012, 2015-2017 ARM Limited
2# All rights reserved.
3#
4# The license below extends only to copyright in the software and shall
5# not be construed as granting a license to any other intellectual
6# property including but not limited to intellectual property relating
7# to a hardware implementation of the functionality of the software
8# licensed hereunder. You may use the software subject to the license

--- 190 unchanged lines hidden (view full) ---

199 self.partition_desc_bin = binary('1up-md.bin')
200
201 self.system_port = self.membus.slave
202
203 return self
204
205def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None,
206 dtb_filename=None, bare_metal=False, cmdline=None,
1# Copyright (c) 2010-2012, 2015-2017 ARM Limited
2# All rights reserved.
3#
4# The license below extends only to copyright in the software and shall
5# not be construed as granting a license to any other intellectual
6# property including but not limited to intellectual property relating
7# to a hardware implementation of the functionality of the software
8# licensed hereunder. You may use the software subject to the license

--- 190 unchanged lines hidden (view full) ---

199 self.partition_desc_bin = binary('1up-md.bin')
200
201 self.system_port = self.membus.slave
202
203 return self
204
205def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None,
206 dtb_filename=None, bare_metal=False, cmdline=None,
207 external_memory="", ruby=False, security=False):
207 external_memory="", ruby=False, security=False,
208 ignore_dtb=False):
208 assert machine_type
209
210 default_dtbs = {
211 "RealViewEB": None,
212 "RealViewPBX": None,
213 "VExpress_EMM": "vexpress.aarch32.ll_20131205.0-gem5.%dcpu.dtb" % num_cpus,
214 "VExpress_EMM64": "vexpress.aarch64.20140821.dtb",
215 }

--- 28 unchanged lines hidden (view full) ---

244 self.mem_mode = mem_mode
245
246 platform_class = PlatformConfig.get(machine_type)
247 # Resolve the real platform name, the original machine_type
248 # variable might have been an alias.
249 machine_type = platform_class.__name__
250 self.realview = platform_class()
251
209 assert machine_type
210
211 default_dtbs = {
212 "RealViewEB": None,
213 "RealViewPBX": None,
214 "VExpress_EMM": "vexpress.aarch32.ll_20131205.0-gem5.%dcpu.dtb" % num_cpus,
215 "VExpress_EMM64": "vexpress.aarch64.20140821.dtb",
216 }

--- 28 unchanged lines hidden (view full) ---

245 self.mem_mode = mem_mode
246
247 platform_class = PlatformConfig.get(machine_type)
248 # Resolve the real platform name, the original machine_type
249 # variable might have been an alias.
250 machine_type = platform_class.__name__
251 self.realview = platform_class()
252
252 if not dtb_filename and not bare_metal:
253 if not dtb_filename and not (bare_metal or ignore_dtb):
253 try:
254 dtb_filename = default_dtbs[machine_type]
255 except KeyError:
256 fatal("No DTB specified and no default DTB known for '%s'" % \
257 machine_type)
258
259 if isinstance(self.realview, VExpress_EMM64):
260 if os.path.split(mdesc.disk())[-1] == 'linux-aarch32-ael.img':

--- 39 unchanged lines hidden (view full) ---

300
301 if bare_metal:
302 # EOT character on UART will end the simulation
303 self.realview.uart.end_on_eot = True
304 else:
305 if machine_type in default_kernels:
306 self.kernel = binary(default_kernels[machine_type])
307
254 try:
255 dtb_filename = default_dtbs[machine_type]
256 except KeyError:
257 fatal("No DTB specified and no default DTB known for '%s'" % \
258 machine_type)
259
260 if isinstance(self.realview, VExpress_EMM64):
261 if os.path.split(mdesc.disk())[-1] == 'linux-aarch32-ael.img':

--- 39 unchanged lines hidden (view full) ---

301
302 if bare_metal:
303 # EOT character on UART will end the simulation
304 self.realview.uart.end_on_eot = True
305 else:
306 if machine_type in default_kernels:
307 self.kernel = binary(default_kernels[machine_type])
308
308 if dtb_filename:
309 if dtb_filename and not ignore_dtb:
309 self.dtb_filename = binary(dtb_filename)
310
311 self.machine_type = machine_type if machine_type in ArmMachineType.map \
312 else "DTOnly"
313
314 # Ensure that writes to the UART actually go out early in the boot
315 if not cmdline:
316 cmdline = 'earlyprintk=pl011,0x1c090000 console=ttyAMA0 ' + \

--- 420 unchanged lines hidden --- 		310 self.dtb_filename = binary(dtb_filename)
311
312 self.machine_type = machine_type if machine_type in ArmMachineType.map \
313 else "DTOnly"
314
315 # Ensure that writes to the UART actually go out early in the boot
316 if not cmdline:
317 cmdline = 'earlyprintk=pl011,0x1c090000 console=ttyAMA0 ' + \

--- 420 unchanged lines hidden ---