Deleted Added
sdiff udiff text old ( 10747:3fe41011333d ) new ( 10780:46070443051e )
full compact
1# Copyright (c) 2010-2012 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

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

198 self.hypervisor_desc_bin = binary('1up-hv.bin')
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 assert machine_type
208
209 if bare_metal:
210 self = ArmSystem()
211 else:
212 self = LinuxArmSystem()
213
214 if not mdesc:

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

288 self.dtb_filename = binary(dtb_filename)
289 self.machine_type = machine_type
290 # Ensure that writes to the UART actually go out early in the boot
291 if not cmdline:
292 cmdline = 'earlyprintk=pl011,0x1c090000 console=ttyAMA0 ' + \
293 'lpj=19988480 norandmaps rw loglevel=8 ' + \
294 'mem=%(mem)s root=%(rootdev)s'
295
296 self.realview.setupBootLoader(self.membus, self, binary)
297 self.gic_cpu_addr = self.realview.gic.cpu_addr
298 self.flags_addr = self.realview.realview_io.pio_addr + 0x30
299
300 # This check is for users who have previously put 'android' in
301 # the disk image filename to tell the config scripts to
302 # prepare the kernel with android-specific boot options. That
303 # behavior has been replaced with a more explicit option per
304 # the error message below. The disk can have any name now and

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

317
318 # release-specific tweaks
319 if 'kitkat' in mdesc.os_type():
320 cmdline += " androidboot.hardware=gem5 qemu=1 qemu.gles=0 " + \
321 "android.bootanim=0"
322
323 self.boot_osflags = fillInCmdline(mdesc, cmdline)
324
325 self.realview.attachOnChipIO(self.membus, self.bridge)
326 self.realview.attachIO(self.iobus)
327 self.intrctrl = IntrControl()
328 self.terminal = Terminal()
329 self.vncserver = VncServer()
330
331 self.system_port = self.membus.slave
332
333 return self

--- 288 unchanged lines hidden ---