diff options
| author | Rizwana Begum <rb639@drexel.edu> | 2015-03-09 09:39:08 -0500 |
|---|---|---|
| committer | Rizwana Begum <rb639@drexel.edu> | 2015-03-09 09:39:08 -0500 |
| commit | 0c8e025c3bd208e516f1c4247fdf3af7aebb2300 (patch) | |
| tree | 0c936f502e192eb9f44d206c37b6a9062db35c63 | |
| parent | e5fbc67e16063cbfec90210d700fa79a8f3b1550 (diff) | |
| download | gem5-0c8e025c3bd208e516f1c4247fdf3af7aebb2300.tar.xz | |
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 <nilay@cs.wisc.edu>
| -rw-r--r-- | configs/common/FSConfig.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index e95fff424..462b8f6f7 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -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.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) |