summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2012-02-05 01:37:40 -0800
committerGabe Black <gblack@eecs.umich.edu>2012-02-05 01:37:40 -0800
commit6cae538ce9e9bcc0ab97cb16acff9716ccd4606d (patch)
treeb1e8bc5c8bfdc5369c8d056fa5b8281f2f8ba8d7
parent82939294d6fda490a1c634a868d05a92621cc1ac (diff)
downloadgem5-6cae538ce9e9bcc0ab97cb16acff9716ccd4606d.tar.xz
X86: Rename the bridge which allows commnication back to the local APICs.
There was a collision with a name used in fs.py, and that causes that script not to work when used with x86.
-rw-r--r--configs/common/FSConfig.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 80379f6a3..c14eb38f0 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -385,12 +385,12 @@ def connectX86ClassicSystem(x86_sys):
# Create a bridge from the IO bus to the memory bus to allow access to
# the local APIC (two pages)
- x86_sys.iobridge = Bridge(delay='50ns', nack_delay='4ns')
- x86_sys.iobridge.slave = x86_sys.iobus.port
- x86_sys.iobridge.master = x86_sys.membus.port
- x86_sys.iobridge.ranges = [AddrRange(interrupts_address_space_base,
- interrupts_address_space_base +
- APIC_range_size - 1)]
+ x86_sys.apicbridge = Bridge(delay='50ns', nack_delay='4ns')
+ x86_sys.apicbridge.slave = x86_sys.iobus.port
+ x86_sys.apicbridge.master = x86_sys.membus.port
+ x86_sys.apicbridge.ranges = [AddrRange(interrupts_address_space_base,
+ interrupts_address_space_base +
+ APIC_range_size - 1)]
# connect the io bus
x86_sys.pc.attachIO(x86_sys.iobus)