FSConfig.py (13605:8904f6c497e6) FSConfig.py (13606:2ad4449e6cb4)
1# Copyright (c) 2010-2012, 2015-2018 ARM Limited
1# Copyright (c) 2010-2012, 2015-2019 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
9# terms below provided that you ensure that this notice is replicated

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

201 self.partition_desc_bin = binary('1up-md.bin')
202
203 self.system_port = self.membus.slave
204
205 return self
206
207def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None,
208 dtb_filename=None, bare_metal=False, cmdline=None,
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
9# terms below provided that you ensure that this notice is replicated

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

201 self.partition_desc_bin = binary('1up-md.bin')
202
203 self.system_port = self.membus.slave
204
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):
209 external_memory="", ruby=False, security=False):
211 assert machine_type
212
213 pci_devices = []
214
215 if bare_metal:
216 self = ArmSystem()
217 else:
218 self = LinuxArmSystem()

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

233 self.mem_mode = mem_mode
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
210 assert machine_type
211
212 pci_devices = []
213
214 if bare_metal:
215 self = ArmSystem()
216 else:
217 self = LinuxArmSystem()

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

232 self.mem_mode = mem_mode
233
234 platform_class = PlatformConfig.get(machine_type)
235 # Resolve the real platform name, the original machine_type
236 # variable might have been an alias.
237 machine_type = platform_class.__name__
238 self.realview = platform_class()
239
241 if not dtb_filename and not (bare_metal or ignore_dtb):
242 fatal("No DTB specified and no default DTB known for '%s'" % \
243 machine_type)
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
252 # Attach any PCI devices this platform supports

--- 31 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:
240 if isinstance(self.realview, VExpress_EMM64):
241 if os.path.split(mdesc.disk())[-1] == 'linux-aarch32-ael.img':
242 print("Selected 64-bit ARM architecture, updating default "
243 "disk image...")
244 mdesc.diskname = 'linaro-minimal-aarch64.img'
245
246
247 # Attach any PCI devices this platform supports

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

279 " another platform")
280
281 self.have_security = security
282
283 if bare_metal:
284 # EOT character on UART will end the simulation
285 self.realview.uart[0].end_on_eot = True
286 else:
292 if dtb_filename and not ignore_dtb:
287 if dtb_filename:
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:
300 cmdline = 'earlyprintk=pl011,0x1c090000 console=ttyAMA0 ' + \

--- 423 unchanged lines hidden --- 		288 self.dtb_filename = binary(dtb_filename)
289
290 self.machine_type = machine_type if machine_type in ArmMachineType.map \
291 else "DTOnly"
292
293 # Ensure that writes to the UART actually go out early in the boot
294 if not cmdline:
295 cmdline = 'earlyprintk=pl011,0x1c090000 console=ttyAMA0 ' + \

--- 423 unchanged lines hidden ---