FSConfig.py (13532:b1cacf73cd4e) FSConfig.py (13605:8904f6c497e6)
1# Copyright (c) 2010-2012, 2015-2018 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

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

205 return self
206
207def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None,
208 dtb_filename=None, bare_metal=False, cmdline=None,
209 external_memory="", ruby=False, security=False,
210 ignore_dtb=False):
211 assert machine_type
212
1# Copyright (c) 2010-2012, 2015-2018 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

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

205 return self
206
207def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None,
208 dtb_filename=None, bare_metal=False, cmdline=None,
209 external_memory="", ruby=False, security=False,
210 ignore_dtb=False):
211 assert machine_type
212
213 default_dtbs = {
214 "RealViewPBX": None,
215 "VExpress_EMM": "vexpress.aarch32.ll_20131205.0-gem5.%dcpu.dtb" % num_cpus,
216 "VExpress_EMM64": "vexpress.aarch64.20140821.dtb",
217 }
218
219 default_kernels = {
220 "RealViewPBX": "vmlinux.arm.smp.fb.2.6.38.8",
221 "VExpress_EMM": "vmlinux.aarch32.ll_20131205.0-gem5",
222 "VExpress_EMM64": "vmlinux.aarch64.20140821",
223 }
224
225 pci_devices = []
226
227 if bare_metal:
228 self = ArmSystem()
229 else:
230 self = LinuxArmSystem()
231
232 if not mdesc:

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

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
253 if not dtb_filename and not (bare_metal or ignore_dtb):
213 pci_devices = []
214
215 if bare_metal:
216 self = ArmSystem()
217 else:
218 self = LinuxArmSystem()
219
220 if not mdesc:

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

234
235 platform_class = PlatformConfig.get(machine_type)
236 # Resolve the real platform name, the original machine_type
237 # variable might have been an alias.
238 machine_type = platform_class.__name__
239 self.realview = platform_class()
240
241 if not dtb_filename and not (bare_metal or ignore_dtb):
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)
242 fatal("No DTB specified and no default DTB known for '%s'" % \
243 machine_type)
259
260 if isinstance(self.realview, VExpress_EMM64):
261 if os.path.split(mdesc.disk())[-1] == 'linux-aarch32-ael.img':
262 print("Selected 64-bit ARM architecture, updating default "
263 "disk image...")
264 mdesc.diskname = 'linaro-minimal-aarch64.img'
265
266

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

299 " another platform")
300
301 self.have_security = security
302
303 if bare_metal:
304 # EOT character on UART will end the simulation
305 self.realview.uart[0].end_on_eot = True
306 else:
244
245 if isinstance(self.realview, VExpress_EMM64):
246 if os.path.split(mdesc.disk())[-1] == 'linux-aarch32-ael.img':
247 print("Selected 64-bit ARM architecture, updating default "
248 "disk image...")
249 mdesc.diskname = 'linaro-minimal-aarch64.img'
250
251

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

284 " another platform")
285
286 self.have_security = security
287
288 if bare_metal:
289 # EOT character on UART will end the simulation
290 self.realview.uart[0].end_on_eot = True
291 else:
307 if machine_type in default_kernels:
308 self.kernel = binary(default_kernels[machine_type])
309
310 if dtb_filename and not ignore_dtb:
311 self.dtb_filename = binary(dtb_filename)
312
313 self.machine_type = machine_type if machine_type in ArmMachineType.map \
314 else "DTOnly"
315
316 # Ensure that writes to the UART actually go out early in the boot
317 if not cmdline:

--- 424 unchanged lines hidden --- 		292 if dtb_filename and not ignore_dtb:
293 self.dtb_filename = binary(dtb_filename)
294
295 self.machine_type = machine_type if machine_type in ArmMachineType.map \
296 else "DTOnly"
297
298 # Ensure that writes to the UART actually go out early in the boot
299 if not cmdline:

--- 424 unchanged lines hidden ---