diff options
| author | Steve Reinhardt <stever@gmail.com> | 2008-03-25 10:04:52 -0400 |
|---|---|---|
| committer | Steve Reinhardt <stever@gmail.com> | 2008-03-25 10:04:52 -0400 |
| commit | ba1f7d31e0f28d64df2fb03fe4b69182b9d3ff34 (patch) | |
| tree | 33f52cbce6ac4fa332976d2a53977c7bde876c6b /configs/common/FSConfig.py | |
| parent | 29be31ce3139c36f596e6edafbd3d253ee2200b3 (diff) | |
| parent | 93dd1978a7750ba7cce04ae4401f5c6689290038 (diff) | |
| download | gem5-ba1f7d31e0f28d64df2fb03fe4b69182b9d3ff34.tar.xz | |
Automated merge with ssh://daystrom.m5sim.org//repo/m5
--HG--
extra : convert_revision : 7922848bb1145bcb2ee07d672d21cfe2dd98fc03
Diffstat (limited to 'configs/common/FSConfig.py')
| -rw-r--r-- | configs/common/FSConfig.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index 44c13ef78..bcc80eaf9 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -177,19 +177,12 @@ def makeLinuxX86System(mem_mode, mdesc = None): self.bridge.side_a = self.iobus.port self.bridge.side_b = self.membus.port - # Serial port and console - self.console = SimConsole() - self.com_1 = Uart8250() - self.com_1.pio_addr = x86IOAddress(0x3f8) - 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() - self.opteron.attachIO(self.iobus) + self.pc = PC() + self.pc.attachIO(self.iobus) self.intrctrl = IntrControl() |