From 0c8e025c3bd208e516f1c4247fdf3af7aebb2300 Mon Sep 17 00:00:00 2001 From: Rizwana Begum Date: Mon, 9 Mar 2015 09:39:08 -0500 Subject: 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 --- configs/common/FSConfig.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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) -- cgit v1.2.3