changeset 071996521ce6 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=071996521ce6
description:
config: Fix for 'android' lookup in disk name
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 <[email protected]>
diffstat:
configs/common/FSConfig.py | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diffs (14 lines):
diff -r cbed6a2cbc35 -r 071996521ce6 configs/common/FSConfig.py
--- a/configs/common/FSConfig.py Mon Mar 09 09:39:08 2015 -0500
+++ b/configs/common/FSConfig.py Mon Mar 09 09:39:08 2015 -0500
@@ -286,7 +286,9 @@
self.gic_cpu_addr = self.realview.gic.cpu_addr
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 "
self.boot_osflags = fillInCmdline(mdesc, cmdline)
self.realview.attachOnChipIO(self.membus, self.bridge)
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
