From 6cae538ce9e9bcc0ab97cb16acff9716ccd4606d Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 5 Feb 2012 01:37:40 -0800 Subject: [PATCH] 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. --- configs/common/FSConfig.py | 12 ++++++------ 1 file 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)