summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2008-01-21 04:32:34 -0500
committerGabe Black <gblack@eecs.umich.edu>2008-01-21 04:32:34 -0500
commit657b52fea1aa53988b83e4cd91dac7836825a7d7 (patch)
tree174f7f7c8aa22a7836117b93e1782a8cd974133c
parent48295aa5147b11cdf4eebbf561b65c8d5668c019 (diff)
downloadgem5-657b52fea1aa53988b83e4cd91dac7836825a7d7.tar.xz
X86: Use the existing boot_osflags instead of duplicating it.
--HG-- extra : convert_revision : e04e438d7d261a61c52b946c23cd126ed648814a
-rw-r--r--configs/common/FSConfig.py3
-rw-r--r--src/arch/x86/X86System.py1
-rw-r--r--src/arch/x86/linux/system.cc2
3 files changed, 4 insertions, 2 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index c8916841b..6d7634106 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -184,6 +184,9 @@ def makeLinuxX86System(mem_mode, mdesc = None):
self.com_1.pio = self.iobus.port
self.com_1.sim_console = self.console
+ # Command line
+ self.boot_osflags = 'earlyprintk=ttyS0'
+
# Platform
self.opteron = Opteron()
diff --git a/src/arch/x86/X86System.py b/src/arch/x86/X86System.py
index acee5ac36..f73764540 100644
--- a/src/arch/x86/X86System.py
+++ b/src/arch/x86/X86System.py
@@ -61,4 +61,3 @@ class X86System(System):
class LinuxX86System(X86System):
type = 'LinuxX86System'
- command_line = Param.String("", "the kernel command line")
diff --git a/src/arch/x86/linux/system.cc b/src/arch/x86/linux/system.cc
index 2569fb0ae..944bb2930 100644
--- a/src/arch/x86/linux/system.cc
+++ b/src/arch/x86/linux/system.cc
@@ -68,7 +68,7 @@ using namespace LittleEndianGuest;
using namespace X86ISA;
LinuxX86System::LinuxX86System(Params *p)
- : X86System(p), commandLine(p->command_line)
+ : X86System(p), commandLine(p->boot_osflags)
{
}