summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2017-11-17 15:24:28 -0800
committerGabe Black <gabeblack@google.com>2017-11-20 00:15:28 +0000
commit205add5769e3978341cb9aa71d563dfb048e1f13 (patch)
treee09783c1dbdfddb37d849ddc6185d69a69c83bd3
parent4fd58c6494080302c4fc765c83cb76b5947d1cae (diff)
downloadgem5-205add5769e3978341cb9aa71d563dfb048e1f13.tar.xz
dev: Fix the SPARC and X86 platform devices.
A recent serial device refactoring changed the name of the parameter that the terminal device gets attached to on the UART. The x86 and SPARC platform devices didn't get updated though, and were still using the old name. This change updates those objects. Reported-by: Kanad Basu <kanad.kut@gmail.com> Change-Id: I0824a9df8639062d8561420ea9ffea26b8b7e2e9 Reviewed-on: https://gem5-review.googlesource.com/5781 Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Maintainer: Jason Lowe-Power <jason@lowepower.com>
-rw-r--r--src/dev/sparc/T1000.py4
-rw-r--r--src/dev/x86/Pc.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/dev/sparc/T1000.py b/src/dev/sparc/T1000.py
index 511f54b2c..99f083450 100644
--- a/src/dev/sparc/T1000.py
+++ b/src/dev/sparc/T1000.py
@@ -121,8 +121,8 @@ class T1000(Platform):
# earlier, since the bus object itself is typically defined at the
# System level.
def attachIO(self, bus):
- self.hvuart.terminal = self.hterm
- self.puart0.terminal = self.pterm
+ self.hvuart.device = self.hterm
+ self.puart0.device = self.pterm
self.fake_clk.pio = bus.master
self.fake_membnks.pio = bus.master
self.fake_l2_1.pio = bus.master
diff --git a/src/dev/x86/Pc.py b/src/dev/x86/Pc.py
index 3100f59b7..4d20214ad 100644
--- a/src/dev/x86/Pc.py
+++ b/src/dev/x86/Pc.py
@@ -65,7 +65,7 @@ class Pc(Platform):
# Serial port and terminal
com_1 = Uart8250()
com_1.pio_addr = x86IOAddress(0x3f8)
- com_1.terminal = Terminal()
+ com_1.device = Terminal()
# Devices to catch access to non-existant serial ports.
fake_com_2 = IsaFake(pio_addr=x86IOAddress(0x2f8), pio_size=8)