From: Malek Musleh <malek.musleh@gmail.com>
Date: Fri, 30 Jan 2015 21:49:34 +0000 (-0600)
Subject: config: arm: fix os_flags
X-Git-Tag: stable_2015_04_15
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ca131a41960a43dc37410664d2a36350bc1d32b0;p=gem5.git

config: arm: fix os_flags
Fix the makeArmSystem routine to reflect recent changes that support kernel
commandline option when running android. Without this fix, trying to run
android encounters a 'reference before assignment' error.

Committed by: Nilay Vaish <nilay@cs.wisc.edu>
---

diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 50c5bc4ff..88de3b8df 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -286,7 +286,7 @@ def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None,
         self.flags_addr = self.realview.realview_io.pio_addr + 0x30
 
         if mdesc.disk().lower().count('android'):
-            boot_flags += " init=/init "
+            cmdline += " init=/init "
         self.boot_osflags = fillInCmdline(mdesc, cmdline)
     self.realview.attachOnChipIO(self.membus, self.bridge)
     self.realview.attachIO(self.iobus)