1 files changed, 33 insertions, 35 deletions
diff --git a/tests/long/10.linux-boot/ref/arm/linux/realview-o3/config.ini b/tests/long/10.linux-boot/ref/arm/linux/realview-o3/config.ini
index 0e78591b5..c84a9ea85 100644
--- a/tests/long/10.linux-boot/ref/arm/linux/realview-o3/config.ini
+++ b/tests/long/10.linux-boot/ref/arm/linux/realview-o3/config.ini
@@ -32,20 +32,18 @@ work_cpus_ckpt_count=0
 work_end_ckpt_count=0
 work_end_exit_count=0
 work_item_id=-1
+system_port=system.membus.port[7]
 
 [system.bridge]
 type=Bridge
 delay=50000
-filter_ranges_a=0:18446744073709551615
-filter_ranges_b=0:268435455
 nack_delay=4000
-req_size_a=16
-req_size_b=16
-resp_size_a=16
-resp_size_b=16
+ranges=268435456:520093695 1073741824:18446744073709551615
+req_size=16
+resp_size=16
 write_ack=false
-side_a=system.iobus.port[0]
-side_b=system.membus.port[0]
+master=system.iobus.port[0]
+slave=system.membus.port[0]
 
 [system.cf0]
 type=IdeDisk
@@ -533,7 +531,7 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-port=system.bridge.side_a system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.dmac_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.smc_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.gpio0_fake.pio system.realview.gpio1_fake.pio system.realview.gpio2_fake.pio system.realview.ssp_fake.pio system.realview.sci_fake.pio system.realview.aaci_fake.pio system.realview.mmc_fake.pio system.realview.rtc_fake.pio system.realview.flash_fake.pio system.iocache.cpu_side system.realview.cf_ctrl.config system.realview.cf_ctrl.dma system.realview.clcd.dma
+port=system.bridge.master system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.clcd.dma system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.cf_ctrl.config system.realview.cf_ctrl.dma system.realview.dmac_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.smc_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.gpio0_fake.pio system.realview.gpio1_fake.pio system.realview.gpio2_fake.pio system.realview.ssp_fake.pio system.realview.sci_fake.pio system.realview.aaci_fake.pio system.realview.mmc_fake.pio system.realview.rtc_fake.pio system.realview.flash_fake.pio system.iocache.cpu_side
 
 [system.iocache]
 type=BaseCache
@@ -564,8 +562,8 @@ tgts_per_mshr=12
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.iobus.port[25]
-mem_side=system.membus.port[7]
+cpu_side=system.iobus.port[28]
+mem_side=system.membus.port[8]
 
 [system.l2c]
 type=BaseCache
@@ -597,7 +595,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.toL2Bus.port[0]
-mem_side=system.membus.port[8]
+mem_side=system.membus.port[9]
 
 [system.membus]
 type=Bus
@@ -609,7 +607,7 @@ header_cycles=1
 use_default_range=false
 width=64
 default=system.membus.badaddr_responder.pio
-port=system.bridge.side_b system.nvmem.port[0] system.physmem.port[0] system.realview.gic.pio system.realview.l2x0_fake.pio system.realview.a9scu.pio system.realview.local_cpu_timer.pio system.iocache.mem_side system.l2c.mem_side
+port=system.bridge.slave system.nvmem.port[0] system.physmem.port[0] system.realview.gic.pio system.realview.l2x0_fake.pio system.realview.a9scu.pio system.realview.local_cpu_timer.pio system.system_port system.iocache.mem_side system.l2c.mem_side
 
 [system.membus.badaddr_responder]
 type=IsaFake
@@ -671,7 +669,7 @@ pio_addr=268451840
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[21]
+pio=system.iobus.port[24]
 
 [system.realview.cf_ctrl]
 type=IdeController
@@ -725,9 +723,9 @@ pci_func=0
 pio_latency=1000
 platform=system.realview
 system=system
-config=system.iobus.port[26]
-dma=system.iobus.port[27]
-pio=system.iobus.port[8]
+config=system.iobus.port[10]
+dma=system.iobus.port[11]
+pio=system.iobus.port[9]
 
 [system.realview.clcd]
 type=Pl111
@@ -742,7 +740,7 @@ pio_latency=10000
 platform=system.realview
 system=system
 vnc=system.vncserver
-dma=system.iobus.port[28]
+dma=system.iobus.port[6]
 pio=system.iobus.port[5]
 
 [system.realview.dmac_fake]
@@ -753,7 +751,7 @@ pio_addr=268632064
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[9]
+pio=system.iobus.port[12]
 
 [system.realview.flash_fake]
 type=IsaFake
@@ -770,7 +768,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[24]
+pio=system.iobus.port[27]
 
 [system.realview.gic]
 type=Gic
@@ -792,7 +790,7 @@ pio_addr=268513280
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[16]
+pio=system.iobus.port[19]
 
 [system.realview.gpio1_fake]
 type=AmbaFake
@@ -802,7 +800,7 @@ pio_addr=268517376
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[17]
+pio=system.iobus.port[20]
 
 [system.realview.gpio2_fake]
 type=AmbaFake
@@ -812,7 +810,7 @@ pio_addr=268521472
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[18]
+pio=system.iobus.port[21]
 
 [system.realview.kmi0]
 type=Pl050
@@ -826,7 +824,7 @@ pio_latency=1000
 platform=system.realview
 system=system
 vnc=system.vncserver
-pio=system.iobus.port[6]
+pio=system.iobus.port[7]
 
 [system.realview.kmi1]
 type=Pl050
@@ -840,7 +838,7 @@ pio_latency=1000
 platform=system.realview
 system=system
 vnc=system.vncserver
-pio=system.iobus.port[7]
+pio=system.iobus.port[8]
 
 [system.realview.l2x0_fake]
 type=IsaFake
@@ -879,7 +877,7 @@ pio_addr=268455936
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[22]
+pio=system.iobus.port[25]
 
 [system.realview.realview_io]
 type=RealViewCtrl
@@ -900,7 +898,7 @@ pio_addr=268529664
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[23]
+pio=system.iobus.port[26]
 
 [system.realview.sci_fake]
 type=AmbaFake
@@ -910,7 +908,7 @@ pio_addr=268492800
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[20]
+pio=system.iobus.port[23]
 
 [system.realview.smc_fake]
 type=AmbaFake
@@ -920,7 +918,7 @@ pio_addr=269357056
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[13]
+pio=system.iobus.port[16]
 
 [system.realview.sp810_fake]
 type=AmbaFake
@@ -930,7 +928,7 @@ pio_addr=268439552
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[14]
+pio=system.iobus.port[17]
 
 [system.realview.ssp_fake]
 type=AmbaFake
@@ -940,7 +938,7 @@ pio_addr=268488704
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[19]
+pio=system.iobus.port[22]
 
 [system.realview.timer0]
 type=Sp804
@@ -991,7 +989,7 @@ pio_addr=268476416
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[10]
+pio=system.iobus.port[13]
 
 [system.realview.uart2_fake]
 type=AmbaFake
@@ -1001,7 +999,7 @@ pio_addr=268480512
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[11]
+pio=system.iobus.port[14]
 
 [system.realview.uart3_fake]
 type=AmbaFake
@@ -1011,7 +1009,7 @@ pio_addr=268484608
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[12]
+pio=system.iobus.port[15]
 
 [system.realview.watchdog_fake]
 type=AmbaFake
@@ -1021,7 +1019,7 @@ pio_addr=268500992
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[15]
+pio=system.iobus.port[18]
 
 [system.terminal]
 type=Terminal