sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

config: Fix for 'android' lookup in disk name

Browse source 
This patch modifies FSConfig.py to look for 'android' only in disk
image name. Before this patch, 'android' was searched in full
disk path.

Committed by: Nilay Vaish <nilay@cs.wisc.edu>
This commit is contained in:
Rizwana Begum 2015-03-09 09:39:08 -05:00
parent e5fbc67e16
commit 0c8e025c3b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configs/common/FSConfig.py
View file

@ -286,7 +286,9 @@ def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None,
self.gic_cpu_addr = self.realview.gic.cpu_addr self.gic_cpu_addr = self.realview.gic.cpu_addr
self.flags_addr = self.realview.realview_io.pio_addr + 0x30 self.flags_addr = self.realview.realview_io.pio_addr + 0x30
if mdesc.disk().lower().count('android'): # Android disk images must have 'android' keyword in the disk name
# Look for 'android' in disk name and append /init to boot_osflags
if (os.path.split(mdesc.disk())[-1]).lower().count('android'):
cmdline += " init=/init " cmdline += " init=/init "
self.boot_osflags = fillInCmdline(mdesc, cmdline) self.boot_osflags = fillInCmdline(mdesc, cmdline)
self.realview.attachOnChipIO(self.membus, self.bridge) self.realview.attachOnChipIO(self.membus, self.bridge)