commit ca131a41960a43dc37410664d2a36350bc1d32b0
author Malek Musleh <malek.musleh@gmail.com> Fri Jan 30 15:49:34 2015 -0600
committer Malek Musleh <malek.musleh@gmail.com> Fri Jan 30 15:49:34 2015 -0600
tree 697c7e7320c5c0638ab4f7d2086ae8ba89d703ce
parent 89b3616d7e3318637c1550605703f140ecf7b65f

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>

configs/common/FSConfig.py

diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 50c5bc4..88de3b8 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -286,7 +286,7 @@
         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)