1 files changed, 38 insertions, 38 deletions

diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini
index f7597645c..5b5bd9164 100644
--- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini
+++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini
@@ -9,18 +9,19 @@ time_sync_spin_threshold=100000000
 type=LinuxArmSystem
 children=bridge cf0 cpu intrctrl iobus iocache l2c membus nvmem physmem realview terminal toL2Bus vncserver
 boot_cpu_frequency=500
-boot_loader=/chips/pd/randd/dist/binaries/boot.arm
+boot_loader=/dist/m5/system/binaries/boot.arm
 boot_loader_mem=system.nvmem
 boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1
 flags_addr=268435504
 gic_cpu_addr=520093952
 init_param=0
-kernel=/chips/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
+kernel=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
 load_addr_mask=268435455
 machine_type=RealView_PBX
 mem_mode=atomic
 memories=system.nvmem system.physmem
 midr_regval=890224640
+num_work_ids=16
 physmem=system.physmem
 readfile=tests/halt.sh
 symbolfile=
@@ -31,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
@@ -63,7 +62,7 @@ table_size=65536
 
 [system.cf0.image.child]
 type=RawDiskImage
-image_file=/chips/pd/randd/dist/disks/linux-arm-ael.img
+image_file=/dist/m5/system/disks/linux-arm-ael.img
 read_only=true
 
 [system.cpu]
@@ -205,7 +204,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
@@ -236,8 +235,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
@@ -269,7 +268,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
@@ -281,7 +280,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
@@ -343,7 +342,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
@@ -397,9 +396,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
@@ -414,7 +413,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]
@@ -425,7 +424,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
@@ -442,7 +441,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
@@ -464,7 +463,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
@@ -474,7 +473,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
@@ -484,7 +483,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
@@ -498,7 +497,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
@@ -512,7 +511,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
@@ -551,7 +550,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
@@ -572,7 +571,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
@@ -582,7 +581,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
@@ -592,7 +591,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
@@ -602,7 +601,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
@@ -612,7 +611,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
@@ -663,7 +662,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
@@ -673,7 +672,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
@@ -683,7 +682,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
@@ -693,7 +692,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
@@ -714,6 +713,7 @@ port=system.l2c.cpu_side system.cpu.icache.mem_side system.cpu.dcache.mem_side s
 
 [system.vncserver]
 type=VncServer
+frame_capture=false
 number=0
 port=5900