summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalek Musleh <malek.musleh@gmail.com>2015-01-30 15:49:34 -0600
committerMalek Musleh <malek.musleh@gmail.com>2015-01-30 15:49:34 -0600
commitca131a41960a43dc37410664d2a36350bc1d32b0 (patch)
tree697c7e7320c5c0638ab4f7d2086ae8ba89d703ce
parent89b3616d7e3318637c1550605703f140ecf7b65f (diff)
downloadgem5-ca131a41960a43dc37410664d2a36350bc1d32b0.tar.xz
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>
-rw-r--r--configs/common/FSConfig.py2
1 files changed, 1 insertions, 1 deletions
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)