ARM: Update stats for valgrind fix and replace config.inis which are out of date.

28 files changed, 568 insertions, 514 deletions

diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini
index 3f759d7fa..1946d5bbf 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini
@@ -10,13 +10,13 @@ time_sync_spin_threshold=100000000
 type=LinuxArmSystem
 children=bridge cf0 cpu intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver
 atags_addr=256
-boot_loader=/dist/m5/system/binaries/boot.arm
+boot_loader=/projects/pd/randd/dist/binaries/boot.arm
 boot_loader_mem=system.realview.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=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+kernel=/projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 load_addr_mask=268435455
 machine_type=RealView_PBX
 mem_mode=timing
@@ -63,7 +63,7 @@ table_size=65536
 
 [system.cf0.image.child]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-arm-ael.img
+image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img
 read_only=true
 
 [system.cpu]
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout
index cda9d1fbb..b50c47979 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout
@@ -1,15 +1,15 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Mar  7 2012 20:12:09
-gem5 started Mar  7 2012 20:48:24
-gem5 executing on zizzer
-command line: build/ARM/gem5.fast -d build/ARM/tests/fast/long/fs/10.linux-boot/arm/linux/realview-o3-checker -re tests/run.py build/ARM/tests/fast/long/fs/10.linux-boot/arm/linux/realview-o3-checker
+gem5 compiled Mar  9 2012 08:32:03
+gem5 started Mar  9 2012 08:34:27
+gem5 executing on u200540-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-checker -re tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-checker
 The currently selected ARM platforms doesn't support
  the amount of DRAM you've selected. Please try
  another platform
 Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 info: Using bootloader at address 0x80000000
 info: Entering event queue @ 0.  Starting simulation...
 Exiting @ tick 2503289265500 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt
index 7ed4fc446..3749ebea8 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  2.503289                       # Nu
 sim_ticks                                2503289265500                       # Number of ticks simulated
 final_tick                               2503289265500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  68005                       # Simulator instruction rate (inst/s)
-host_op_rate                                    87841                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             2863403297                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 387312                       # Number of bytes of host memory used
-host_seconds                                   874.24                       # Real time elapsed on the host
+host_inst_rate                                  55466                       # Simulator instruction rate (inst/s)
+host_op_rate                                    71644                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             2335415954                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 389340                       # Number of bytes of host memory used
+host_seconds                                  1071.88                       # Real time elapsed on the host
 sim_insts                                    59452703                       # Number of instructions simulated
 sim_ops                                      76793713                       # Number of ops (including micro ops) simulated
 system.realview.nvmem.bytes_read                   64                       # Number of bytes read from this memory
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini
index 23b3ee992..ab2042d3e 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini
@@ -8,18 +8,19 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=LinuxArmSystem
-children=bridge cf0 cpu0 cpu1 intrctrl iobus iocache l2c membus nvmem physmem realview terminal toL2Bus vncserver
-boot_loader=/dist/m5/system/binaries/boot.arm
-boot_loader_mem=system.nvmem
+children=bridge cf0 cpu0 cpu1 intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver
+atags_addr=256
+boot_loader=/projects/pd/randd/dist/binaries/boot.arm
+boot_loader_mem=system.realview.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=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+kernel=/projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 load_addr_mask=268435455
 machine_type=RealView_PBX
 mem_mode=timing
-memories=system.nvmem system.physmem
+memories=system.physmem system.realview.nvmem
 midr_regval=890224640
 num_work_ids=16
 physmem=system.physmem
@@ -32,18 +33,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_port=system.membus.slave[0]
 
 [system.bridge]
 type=Bridge
 delay=50000
 nack_delay=4000
-ranges=268435456:520093695 1073741824:18446744073709551615
+ranges=268435456:520093695 1073741824:1610612735
 req_size=16
 resp_size=16
 write_ack=false
-master=system.iobus.port[0]
-slave=system.membus.port[0]
+master=system.iobus.slave[0]
+slave=system.membus.master[0]
 
 [system.cf0]
 type=IdeDisk
@@ -62,7 +63,7 @@ table_size=65536
 
 [system.cf0.image.child]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-arm-ael.img
+image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img
 read_only=true
 
 [system.cpu0]
@@ -164,7 +165,7 @@ icache_port=system.cpu0.icache.cpu_side
 
 [system.cpu0.dcache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
 forward_snoops=true
@@ -185,7 +186,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu0.dcache_port
-mem_side=system.toL2Bus.port[2]
+mem_side=system.toL2Bus.slave[1]
 
 [system.cpu0.dtb]
 type=ArmTLB
@@ -198,7 +199,7 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[4]
+port=system.toL2Bus.slave[3]
 
 [system.cpu0.fuPool]
 type=FUPool
@@ -465,7 +466,7 @@ opLat=3
 
 [system.cpu0.icache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=1
 block_size=64
 forward_snoops=true
@@ -486,7 +487,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu0.icache_port
-mem_side=system.toL2Bus.port[1]
+mem_side=system.toL2Bus.slave[0]
 
 [system.cpu0.interrupts]
 type=ArmInterrupts
@@ -502,7 +503,7 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[3]
+port=system.toL2Bus.slave[2]
 
 [system.cpu0.tracer]
 type=ExeTracer
@@ -606,7 +607,7 @@ icache_port=system.cpu1.icache.cpu_side
 
 [system.cpu1.dcache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
 forward_snoops=true
@@ -627,7 +628,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu1.dcache_port
-mem_side=system.toL2Bus.port[6]
+mem_side=system.toL2Bus.slave[5]
 
 [system.cpu1.dtb]
 type=ArmTLB
@@ -640,7 +641,7 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[8]
+port=system.toL2Bus.slave[7]
 
 [system.cpu1.fuPool]
 type=FUPool
@@ -907,7 +908,7 @@ opLat=3
 
 [system.cpu1.icache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=1
 block_size=64
 forward_snoops=true
@@ -928,7 +929,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu1.icache_port
-mem_side=system.toL2Bus.port[5]
+mem_side=system.toL2Bus.slave[4]
 
 [system.cpu1.interrupts]
 type=ArmInterrupts
@@ -944,7 +945,7 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[7]
+port=system.toL2Bus.slave[6]
 
 [system.cpu1.tracer]
 type=ExeTracer
@@ -961,11 +962,12 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-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
+master=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.cf_ctrl.config 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
+slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma
 
 [system.iocache]
 type=BaseCache
-addr_range=0:268435455
+addr_ranges=0:268435455
 assoc=8
 block_size=64
 forward_snoops=false
@@ -985,12 +987,12 @@ tgts_per_mshr=12
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.iobus.port[28]
-mem_side=system.membus.port[8]
+cpu_side=system.iobus.master[25]
+mem_side=system.membus.slave[1]
 
 [system.l2c]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=8
 block_size=64
 forward_snoops=true
@@ -1010,8 +1012,8 @@ tgts_per_mshr=16
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.toL2Bus.port[0]
-mem_side=system.membus.port[9]
+cpu_side=system.toL2Bus.master[0]
+mem_side=system.membus.slave[2]
 
 [system.membus]
 type=Bus
@@ -1023,7 +1025,8 @@ header_cycles=1
 use_default_range=false
 width=64
 default=system.membus.badaddr_responder.pio
-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
+master=system.bridge.slave system.realview.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
+slave=system.system_port system.iocache.mem_side system.l2c.mem_side
 
 [system.membus.badaddr_responder]
 type=IsaFake
@@ -1041,16 +1044,6 @@ update_data=false
 warn_access=warn
 pio=system.membus.default
 
-[system.nvmem]
-type=PhysicalMemory
-file=
-latency=30000
-latency_var=0
-null=false
-range=2147483648:2214592511
-zero=true
-port=system.membus.port[1]
-
 [system.physmem]
 type=PhysicalMemory
 file=
@@ -1058,13 +1051,15 @@ latency=30000
 latency_var=0
 null=false
 range=0:134217727
-zero=true
-port=system.membus.port[2]
+zero=false
+port=system.membus.master[2]
 
 [system.realview]
 type=RealView
-children=a9scu aaci_fake cf_ctrl clcd dmac_fake flash_fake gic gpio0_fake gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake local_cpu_timer mmc_fake realview_io rtc_fake sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake watchdog_fake
+children=a9scu aaci_fake cf_ctrl clcd dmac_fake flash_fake gic gpio0_fake gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake local_cpu_timer mmc_fake nvmem realview_io rtc_fake sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake watchdog_fake
 intrctrl=system.intrctrl
+max_mem_size=268435456
+mem_start_addr=0
 pci_cfg_base=0
 system=system
 
@@ -1073,7 +1068,7 @@ type=A9SCU
 pio_addr=520093696
 pio_latency=1000
 system=system
-pio=system.membus.port[5]
+pio=system.membus.master[5]
 
 [system.realview.aaci_fake]
 type=AmbaFake
@@ -1082,7 +1077,7 @@ ignore_access=false
 pio_addr=268451840
 pio_latency=1000
 system=system
-pio=system.iobus.port[24]
+pio=system.iobus.master[21]
 
 [system.realview.cf_ctrl]
 type=IdeController
@@ -1136,9 +1131,9 @@ pci_func=0
 pio_latency=1000
 platform=system.realview
 system=system
-config=system.iobus.port[10]
-dma=system.iobus.port[11]
-pio=system.iobus.port[9]
+config=system.iobus.master[8]
+dma=system.iobus.slave[2]
+pio=system.iobus.master[7]
 
 [system.realview.clcd]
 type=Pl111
@@ -1152,8 +1147,8 @@ pio_addr=268566528
 pio_latency=10000
 system=system
 vnc=system.vncserver
-dma=system.iobus.port[6]
-pio=system.iobus.port[5]
+dma=system.iobus.slave[1]
+pio=system.iobus.master[4]
 
 [system.realview.dmac_fake]
 type=AmbaFake
@@ -1162,7 +1157,7 @@ ignore_access=false
 pio_addr=268632064
 pio_latency=1000
 system=system
-pio=system.iobus.port[12]
+pio=system.iobus.master[9]
 
 [system.realview.flash_fake]
 type=IsaFake
@@ -1178,7 +1173,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[27]
+pio=system.iobus.master[24]
 
 [system.realview.gic]
 type=Gic
@@ -1190,7 +1185,7 @@ int_latency=10000
 it_lines=128
 platform=system.realview
 system=system
-pio=system.membus.port[3]
+pio=system.membus.master[3]
 
 [system.realview.gpio0_fake]
 type=AmbaFake
@@ -1199,7 +1194,7 @@ ignore_access=false
 pio_addr=268513280
 pio_latency=1000
 system=system
-pio=system.iobus.port[19]
+pio=system.iobus.master[16]
 
 [system.realview.gpio1_fake]
 type=AmbaFake
@@ -1208,7 +1203,7 @@ ignore_access=false
 pio_addr=268517376
 pio_latency=1000
 system=system
-pio=system.iobus.port[20]
+pio=system.iobus.master[17]
 
 [system.realview.gpio2_fake]
 type=AmbaFake
@@ -1217,7 +1212,7 @@ ignore_access=false
 pio_addr=268521472
 pio_latency=1000
 system=system
-pio=system.iobus.port[21]
+pio=system.iobus.master[18]
 
 [system.realview.kmi0]
 type=Pl050
@@ -1230,7 +1225,7 @@ pio_addr=268460032
 pio_latency=1000
 system=system
 vnc=system.vncserver
-pio=system.iobus.port[7]
+pio=system.iobus.master[5]
 
 [system.realview.kmi1]
 type=Pl050
@@ -1243,7 +1238,7 @@ pio_addr=268464128
 pio_latency=1000
 system=system
 vnc=system.vncserver
-pio=system.iobus.port[8]
+pio=system.iobus.master[6]
 
 [system.realview.l2x0_fake]
 type=IsaFake
@@ -1259,7 +1254,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.membus.port[4]
+pio=system.membus.master[4]
 
 [system.realview.local_cpu_timer]
 type=CpuLocalTimer
@@ -1270,7 +1265,7 @@ int_num_watchdog=30
 pio_addr=520095232
 pio_latency=1000
 system=system
-pio=system.membus.port[6]
+pio=system.membus.master[6]
 
 [system.realview.mmc_fake]
 type=AmbaFake
@@ -1279,7 +1274,17 @@ ignore_access=false
 pio_addr=268455936
 pio_latency=1000
 system=system
-pio=system.iobus.port[25]
+pio=system.iobus.master[22]
+
+[system.realview.nvmem]
+type=PhysicalMemory
+file=
+latency=30000
+latency_var=0
+null=false
+range=2147483648:2214592511
+zero=true
+port=system.membus.master[1]
 
 [system.realview.realview_io]
 type=RealViewCtrl
@@ -1289,7 +1294,7 @@ pio_latency=1000
 proc_id0=201326592
 proc_id1=201327138
 system=system
-pio=system.iobus.port[2]
+pio=system.iobus.master[1]
 
 [system.realview.rtc_fake]
 type=AmbaFake
@@ -1298,7 +1303,7 @@ ignore_access=false
 pio_addr=268529664
 pio_latency=1000
 system=system
-pio=system.iobus.port[26]
+pio=system.iobus.master[23]
 
 [system.realview.sci_fake]
 type=AmbaFake
@@ -1307,7 +1312,7 @@ ignore_access=false
 pio_addr=268492800
 pio_latency=1000
 system=system
-pio=system.iobus.port[23]
+pio=system.iobus.master[20]
 
 [system.realview.smc_fake]
 type=AmbaFake
@@ -1316,7 +1321,7 @@ ignore_access=false
 pio_addr=269357056
 pio_latency=1000
 system=system
-pio=system.iobus.port[16]
+pio=system.iobus.master[13]
 
 [system.realview.sp810_fake]
 type=AmbaFake
@@ -1325,7 +1330,7 @@ ignore_access=true
 pio_addr=268439552
 pio_latency=1000
 system=system
-pio=system.iobus.port[17]
+pio=system.iobus.master[14]
 
 [system.realview.ssp_fake]
 type=AmbaFake
@@ -1334,7 +1339,7 @@ ignore_access=false
 pio_addr=268488704
 pio_latency=1000
 system=system
-pio=system.iobus.port[22]
+pio=system.iobus.master[19]
 
 [system.realview.timer0]
 type=Sp804
@@ -1347,7 +1352,7 @@ int_num1=36
 pio_addr=268505088
 pio_latency=1000
 system=system
-pio=system.iobus.port[3]
+pio=system.iobus.master[2]
 
 [system.realview.timer1]
 type=Sp804
@@ -1360,7 +1365,7 @@ int_num1=37
 pio_addr=268509184
 pio_latency=1000
 system=system
-pio=system.iobus.port[4]
+pio=system.iobus.master[3]
 
 [system.realview.uart]
 type=Pl011
@@ -1373,7 +1378,7 @@ pio_latency=1000
 platform=system.realview
 system=system
 terminal=system.terminal
-pio=system.iobus.port[1]
+pio=system.iobus.master[0]
 
 [system.realview.uart1_fake]
 type=AmbaFake
@@ -1382,7 +1387,7 @@ ignore_access=false
 pio_addr=268476416
 pio_latency=1000
 system=system
-pio=system.iobus.port[13]
+pio=system.iobus.master[10]
 
 [system.realview.uart2_fake]
 type=AmbaFake
@@ -1391,7 +1396,7 @@ ignore_access=false
 pio_addr=268480512
 pio_latency=1000
 system=system
-pio=system.iobus.port[14]
+pio=system.iobus.master[11]
 
 [system.realview.uart3_fake]
 type=AmbaFake
@@ -1400,7 +1405,7 @@ ignore_access=false
 pio_addr=268484608
 pio_latency=1000
 system=system
-pio=system.iobus.port[15]
+pio=system.iobus.master[12]
 
 [system.realview.watchdog_fake]
 type=AmbaFake
@@ -1409,7 +1414,7 @@ ignore_access=false
 pio_addr=268500992
 pio_latency=1000
 system=system
-pio=system.iobus.port[18]
+pio=system.iobus.master[15]
 
 [system.terminal]
 type=Terminal
@@ -1426,7 +1431,8 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-port=system.l2c.cpu_side system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu0.itb.walker.port system.cpu0.dtb.walker.port system.cpu1.icache.mem_side system.cpu1.dcache.mem_side system.cpu1.itb.walker.port system.cpu1.dtb.walker.port
+master=system.l2c.cpu_side
+slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu0.itb.walker.port system.cpu0.dtb.walker.port system.cpu1.icache.mem_side system.cpu1.dcache.mem_side system.cpu1.itb.walker.port system.cpu1.dtb.walker.port
 
 [system.vncserver]
 type=VncServer
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout
index aac888352..fcc2fd3aa 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout
@@ -1,12 +1,15 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Feb 12 2012 17:19:56
-gem5 started Feb 12 2012 21:03:21
-gem5 executing on zizzer
-command line: build/ARM/gem5.fast -d build/ARM/tests/fast/long/fs/10.linux-boot/arm/linux/realview-o3-dual -re tests/run.py build/ARM/tests/fast/long/fs/10.linux-boot/arm/linux/realview-o3-dual
+gem5 compiled Mar  9 2012 08:32:03
+gem5 started Mar  9 2012 08:35:13
+gem5 executing on u200540-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual -re tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual
+The currently selected ARM platforms doesn't support
+ the amount of DRAM you've selected. Please try
+ another platform
 Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 info: Using bootloader at address 0x80000000
 info: Entering event queue @ 0.  Starting simulation...
 Exiting @ tick 2572328372500 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
index 238cfe679..da2515fe9 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  2.572328                       # Nu
 sim_ticks                                2572328372500                       # Number of ticks simulated
 final_tick                               2572328372500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  81734                       # Simulator instruction rate (inst/s)
-host_op_rate                                   105574                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             3400147622                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 384052                       # Number of bytes of host memory used
-host_seconds                                   756.53                       # Real time elapsed on the host
+host_inst_rate                                  66069                       # Simulator instruction rate (inst/s)
+host_op_rate                                    85341                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             2748514196                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 389880                       # Number of bytes of host memory used
+host_seconds                                   935.90                       # Real time elapsed on the host
 sim_insts                                    61834256                       # Number of instructions simulated
 sim_ops                                      79870174                       # Number of ops (including micro ops) simulated
 system.realview.nvmem.bytes_read                  384                       # Number of bytes read from this memory
@@ -699,9 +699,9 @@ system.cpu0.iew.iewDispNonSpecInsts            457776                       # Nu
 system.cpu0.iew.iewIQFullEvents                 36292                       # Number of times the IQ has become full, causing a stall
 system.cpu0.iew.iewLSQFullEvents                 4432                       # Number of times the LSQ has become full, causing a stall
 system.cpu0.iew.memOrderViolationEvents          9804                       # Number of memory order violations
-system.cpu0.iew.predictedTakenIncorrect        205792                       # Number of branches that were predicted taken incorrectly
+system.cpu0.iew.predictedTakenIncorrect        205793                       # Number of branches that were predicted taken incorrectly
 system.cpu0.iew.predictedNotTakenIncorrect       118466                       # Number of branches that were predicted not taken incorrectly
-system.cpu0.iew.branchMispredicts              324258                       # Number of branch mispredicts detected at execute
+system.cpu0.iew.branchMispredicts              324259                       # Number of branch mispredicts detected at execute
 system.cpu0.iew.iewExecutedInsts             32446755                       # Number of executed instructions
 system.cpu0.iew.iewExecLoadInsts              8074532                       # Number of load instructions executed
 system.cpu0.iew.iewExecSquashedInsts           432384                       # Number of squashed instructions skipped in execute
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/status b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/status
index 48fe3dacf..e41fe50a6 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/status
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/status
@@ -1 +1 @@
-build/ARM_FS/tests/opt/long/10.linux-boot/arm/linux/realview-o3-dual FAILED!
+build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual FAILED!
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal
index 0453fa273..f397106c4 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini
index 2ad88f280..5275111e5 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini
@@ -8,18 +8,19 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=LinuxArmSystem
-children=bridge cf0 cpu intrctrl iobus iocache l2c membus nvmem physmem realview terminal toL2Bus vncserver
-boot_loader=/dist/m5/system/binaries/boot.arm
-boot_loader_mem=system.nvmem
+children=bridge cf0 cpu intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver
+atags_addr=256
+boot_loader=/projects/pd/randd/dist/binaries/boot.arm
+boot_loader_mem=system.realview.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=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+kernel=/projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 load_addr_mask=268435455
 machine_type=RealView_PBX
 mem_mode=timing
-memories=system.nvmem system.physmem
+memories=system.physmem system.realview.nvmem
 midr_regval=890224640
 num_work_ids=16
 physmem=system.physmem
@@ -32,18 +33,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_port=system.membus.slave[0]
 
 [system.bridge]
 type=Bridge
 delay=50000
 nack_delay=4000
-ranges=268435456:520093695 1073741824:18446744073709551615
+ranges=268435456:520093695 1073741824:1610612735
 req_size=16
 resp_size=16
 write_ack=false
-master=system.iobus.port[0]
-slave=system.membus.port[0]
+master=system.iobus.slave[0]
+slave=system.membus.master[0]
 
 [system.cf0]
 type=IdeDisk
@@ -62,7 +63,7 @@ table_size=65536
 
 [system.cf0.image.child]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-arm-ael.img
+image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img
 read_only=true
 
 [system.cpu]
@@ -164,7 +165,7 @@ icache_port=system.cpu.icache.cpu_side
 
 [system.cpu.dcache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
 forward_snoops=true
@@ -185,7 +186,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.dcache_port
-mem_side=system.toL2Bus.port[2]
+mem_side=system.toL2Bus.slave[1]
 
 [system.cpu.dtb]
 type=ArmTLB
@@ -198,7 +199,7 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[4]
+port=system.toL2Bus.slave[3]
 
 [system.cpu.fuPool]
 type=FUPool
@@ -465,7 +466,7 @@ opLat=3
 
 [system.cpu.icache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=1
 block_size=64
 forward_snoops=true
@@ -486,7 +487,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.icache_port
-mem_side=system.toL2Bus.port[1]
+mem_side=system.toL2Bus.slave[0]
 
 [system.cpu.interrupts]
 type=ArmInterrupts
@@ -502,7 +503,7 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[3]
+port=system.toL2Bus.slave[2]
 
 [system.cpu.tracer]
 type=ExeTracer
@@ -519,11 +520,12 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-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
+master=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.cf_ctrl.config 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
+slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma
 
 [system.iocache]
 type=BaseCache
-addr_range=0:268435455
+addr_ranges=0:268435455
 assoc=8
 block_size=64
 forward_snoops=false
@@ -543,12 +545,12 @@ tgts_per_mshr=12
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.iobus.port[28]
-mem_side=system.membus.port[8]
+cpu_side=system.iobus.master[25]
+mem_side=system.membus.slave[1]
 
 [system.l2c]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=8
 block_size=64
 forward_snoops=true
@@ -568,8 +570,8 @@ tgts_per_mshr=16
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.toL2Bus.port[0]
-mem_side=system.membus.port[9]
+cpu_side=system.toL2Bus.master[0]
+mem_side=system.membus.slave[2]
 
 [system.membus]
 type=Bus
@@ -581,7 +583,8 @@ header_cycles=1
 use_default_range=false
 width=64
 default=system.membus.badaddr_responder.pio
-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
+master=system.bridge.slave system.realview.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
+slave=system.system_port system.iocache.mem_side system.l2c.mem_side
 
 [system.membus.badaddr_responder]
 type=IsaFake
@@ -599,16 +602,6 @@ update_data=false
 warn_access=warn
 pio=system.membus.default
 
-[system.nvmem]
-type=PhysicalMemory
-file=
-latency=30000
-latency_var=0
-null=false
-range=2147483648:2214592511
-zero=true
-port=system.membus.port[1]
-
 [system.physmem]
 type=PhysicalMemory
 file=
@@ -616,13 +609,15 @@ latency=30000
 latency_var=0
 null=false
 range=0:134217727
-zero=true
-port=system.membus.port[2]
+zero=false
+port=system.membus.master[2]
 
 [system.realview]
 type=RealView
-children=a9scu aaci_fake cf_ctrl clcd dmac_fake flash_fake gic gpio0_fake gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake local_cpu_timer mmc_fake realview_io rtc_fake sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake watchdog_fake
+children=a9scu aaci_fake cf_ctrl clcd dmac_fake flash_fake gic gpio0_fake gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake local_cpu_timer mmc_fake nvmem realview_io rtc_fake sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake watchdog_fake
 intrctrl=system.intrctrl
+max_mem_size=268435456
+mem_start_addr=0
 pci_cfg_base=0
 system=system
 
@@ -631,7 +626,7 @@ type=A9SCU
 pio_addr=520093696
 pio_latency=1000
 system=system
-pio=system.membus.port[5]
+pio=system.membus.master[5]
 
 [system.realview.aaci_fake]
 type=AmbaFake
@@ -640,7 +635,7 @@ ignore_access=false
 pio_addr=268451840
 pio_latency=1000
 system=system
-pio=system.iobus.port[24]
+pio=system.iobus.master[21]
 
 [system.realview.cf_ctrl]
 type=IdeController
@@ -694,9 +689,9 @@ pci_func=0
 pio_latency=1000
 platform=system.realview
 system=system
-config=system.iobus.port[10]
-dma=system.iobus.port[11]
-pio=system.iobus.port[9]
+config=system.iobus.master[8]
+dma=system.iobus.slave[2]
+pio=system.iobus.master[7]
 
 [system.realview.clcd]
 type=Pl111
@@ -710,8 +705,8 @@ pio_addr=268566528
 pio_latency=10000
 system=system
 vnc=system.vncserver
-dma=system.iobus.port[6]
-pio=system.iobus.port[5]
+dma=system.iobus.slave[1]
+pio=system.iobus.master[4]
 
 [system.realview.dmac_fake]
 type=AmbaFake
@@ -720,7 +715,7 @@ ignore_access=false
 pio_addr=268632064
 pio_latency=1000
 system=system
-pio=system.iobus.port[12]
+pio=system.iobus.master[9]
 
 [system.realview.flash_fake]
 type=IsaFake
@@ -736,7 +731,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[27]
+pio=system.iobus.master[24]
 
 [system.realview.gic]
 type=Gic
@@ -748,7 +743,7 @@ int_latency=10000
 it_lines=128
 platform=system.realview
 system=system
-pio=system.membus.port[3]
+pio=system.membus.master[3]
 
 [system.realview.gpio0_fake]
 type=AmbaFake
@@ -757,7 +752,7 @@ ignore_access=false
 pio_addr=268513280
 pio_latency=1000
 system=system
-pio=system.iobus.port[19]
+pio=system.iobus.master[16]
 
 [system.realview.gpio1_fake]
 type=AmbaFake
@@ -766,7 +761,7 @@ ignore_access=false
 pio_addr=268517376
 pio_latency=1000
 system=system
-pio=system.iobus.port[20]
+pio=system.iobus.master[17]
 
 [system.realview.gpio2_fake]
 type=AmbaFake
@@ -775,7 +770,7 @@ ignore_access=false
 pio_addr=268521472
 pio_latency=1000
 system=system
-pio=system.iobus.port[21]
+pio=system.iobus.master[18]
 
 [system.realview.kmi0]
 type=Pl050
@@ -788,7 +783,7 @@ pio_addr=268460032
 pio_latency=1000
 system=system
 vnc=system.vncserver
-pio=system.iobus.port[7]
+pio=system.iobus.master[5]
 
 [system.realview.kmi1]
 type=Pl050
@@ -801,7 +796,7 @@ pio_addr=268464128
 pio_latency=1000
 system=system
 vnc=system.vncserver
-pio=system.iobus.port[8]
+pio=system.iobus.master[6]
 
 [system.realview.l2x0_fake]
 type=IsaFake
@@ -817,7 +812,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.membus.port[4]
+pio=system.membus.master[4]
 
 [system.realview.local_cpu_timer]
 type=CpuLocalTimer
@@ -828,7 +823,7 @@ int_num_watchdog=30
 pio_addr=520095232
 pio_latency=1000
 system=system
-pio=system.membus.port[6]
+pio=system.membus.master[6]
 
 [system.realview.mmc_fake]
 type=AmbaFake
@@ -837,7 +832,17 @@ ignore_access=false
 pio_addr=268455936
 pio_latency=1000
 system=system
-pio=system.iobus.port[25]
+pio=system.iobus.master[22]
+
+[system.realview.nvmem]
+type=PhysicalMemory
+file=
+latency=30000
+latency_var=0
+null=false
+range=2147483648:2214592511
+zero=true
+port=system.membus.master[1]
 
 [system.realview.realview_io]
 type=RealViewCtrl
@@ -847,7 +852,7 @@ pio_latency=1000
 proc_id0=201326592
 proc_id1=201327138
 system=system
-pio=system.iobus.port[2]
+pio=system.iobus.master[1]
 
 [system.realview.rtc_fake]
 type=AmbaFake
@@ -856,7 +861,7 @@ ignore_access=false
 pio_addr=268529664
 pio_latency=1000
 system=system
-pio=system.iobus.port[26]
+pio=system.iobus.master[23]
 
 [system.realview.sci_fake]
 type=AmbaFake
@@ -865,7 +870,7 @@ ignore_access=false
 pio_addr=268492800
 pio_latency=1000
 system=system
-pio=system.iobus.port[23]
+pio=system.iobus.master[20]
 
 [system.realview.smc_fake]
 type=AmbaFake
@@ -874,7 +879,7 @@ ignore_access=false
 pio_addr=269357056
 pio_latency=1000
 system=system
-pio=system.iobus.port[16]
+pio=system.iobus.master[13]
 
 [system.realview.sp810_fake]
 type=AmbaFake
@@ -883,7 +888,7 @@ ignore_access=true
 pio_addr=268439552
 pio_latency=1000
 system=system
-pio=system.iobus.port[17]
+pio=system.iobus.master[14]
 
 [system.realview.ssp_fake]
 type=AmbaFake
@@ -892,7 +897,7 @@ ignore_access=false
 pio_addr=268488704
 pio_latency=1000
 system=system
-pio=system.iobus.port[22]
+pio=system.iobus.master[19]
 
 [system.realview.timer0]
 type=Sp804
@@ -905,7 +910,7 @@ int_num1=36
 pio_addr=268505088
 pio_latency=1000
 system=system
-pio=system.iobus.port[3]
+pio=system.iobus.master[2]
 
 [system.realview.timer1]
 type=Sp804
@@ -918,7 +923,7 @@ int_num1=37
 pio_addr=268509184
 pio_latency=1000
 system=system
-pio=system.iobus.port[4]
+pio=system.iobus.master[3]
 
 [system.realview.uart]
 type=Pl011
@@ -931,7 +936,7 @@ pio_latency=1000
 platform=system.realview
 system=system
 terminal=system.terminal
-pio=system.iobus.port[1]
+pio=system.iobus.master[0]
 
 [system.realview.uart1_fake]
 type=AmbaFake
@@ -940,7 +945,7 @@ ignore_access=false
 pio_addr=268476416
 pio_latency=1000
 system=system
-pio=system.iobus.port[13]
+pio=system.iobus.master[10]
 
 [system.realview.uart2_fake]
 type=AmbaFake
@@ -949,7 +954,7 @@ ignore_access=false
 pio_addr=268480512
 pio_latency=1000
 system=system
-pio=system.iobus.port[14]
+pio=system.iobus.master[11]
 
 [system.realview.uart3_fake]
 type=AmbaFake
@@ -958,7 +963,7 @@ ignore_access=false
 pio_addr=268484608
 pio_latency=1000
 system=system
-pio=system.iobus.port[15]
+pio=system.iobus.master[12]
 
 [system.realview.watchdog_fake]
 type=AmbaFake
@@ -967,7 +972,7 @@ ignore_access=false
 pio_addr=268500992
 pio_latency=1000
 system=system
-pio=system.iobus.port[18]
+pio=system.iobus.master[15]
 
 [system.terminal]
 type=Terminal
@@ -984,7 +989,8 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-port=system.l2c.cpu_side system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
+master=system.l2c.cpu_side
+slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
 [system.vncserver]
 type=VncServer
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simout
index a1c7f49b7..c7a1b63e2 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simout
@@ -1,12 +1,15 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Feb 12 2012 17:19:56
-gem5 started Feb 12 2012 21:01:11
-gem5 executing on zizzer
-command line: build/ARM/gem5.fast -d build/ARM/tests/fast/long/fs/10.linux-boot/arm/linux/realview-o3 -re tests/run.py build/ARM/tests/fast/long/fs/10.linux-boot/arm/linux/realview-o3
+gem5 compiled Mar  9 2012 08:32:03
+gem5 started Mar  9 2012 08:34:20
+gem5 executing on u200540-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3 -re tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3
+The currently selected ARM platforms doesn't support
+ the amount of DRAM you've selected. Please try
+ another platform
 Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 info: Using bootloader at address 0x80000000
 info: Entering event queue @ 0.  Starting simulation...
 Exiting @ tick 2503289265500 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt
index 28a21b62c..c91fe0ed5 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  2.503289                       # Nu
 sim_ticks                                2503289265500                       # Number of ticks simulated
 final_tick                               2503289265500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  81468                       # Simulator instruction rate (inst/s)
-host_op_rate                                   105230                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             3430236303                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 383240                       # Number of bytes of host memory used
-host_seconds                                   729.77                       # Real time elapsed on the host
+host_inst_rate                                  65661                       # Simulator instruction rate (inst/s)
+host_op_rate                                    84813                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             2764710189                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 389064                       # Number of bytes of host memory used
+host_seconds                                   905.44                       # Real time elapsed on the host
 sim_insts                                    59452703                       # Number of instructions simulated
 sim_ops                                      76793713                       # Number of ops (including micro ops) simulated
 system.realview.nvmem.bytes_read                   64                       # Number of bytes read from this memory
@@ -522,9 +522,9 @@ system.cpu.iew.iewDispNonSpecInsts            1231045                       # Nu
 system.cpu.iew.iewIQFullEvents                  92628                       # Number of times the IQ has become full, causing a stall
 system.cpu.iew.iewLSQFullEvents                 11369                       # Number of times the LSQ has become full, causing a stall
 system.cpu.iew.memOrderViolationEvents          32446                       # Number of memory order violations
-system.cpu.iew.predictedTakenIncorrect         597023                       # Number of branches that were predicted taken incorrectly
+system.cpu.iew.predictedTakenIncorrect         597024                       # Number of branches that were predicted taken incorrectly
 system.cpu.iew.predictedNotTakenIncorrect       332843                       # Number of branches that were predicted not taken incorrectly
-system.cpu.iew.branchMispredicts               929866                       # Number of branch mispredicts detected at execute
+system.cpu.iew.branchMispredicts               929867                       # Number of branch mispredicts detected at execute
 system.cpu.iew.iewExecutedInsts             122679068                       # Number of executed instructions
 system.cpu.iew.iewExecLoadInsts              52684410                       # Number of load instructions executed
 system.cpu.iew.iewExecSquashedInsts           3289901                       # Number of squashed instructions skipped in execute
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/system.terminal
index 1dbe30c5e..cba5e36b0 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/system.terminal
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
index 499c6a74e..ebd663d39 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
@@ -8,18 +8,19 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=LinuxArmSystem
-children=bridge cf0 cpu0 cpu1 intrctrl iobus iocache l2c membus nvmem physmem realview terminal toL2Bus vncserver
-boot_loader=/dist/m5/system/binaries/boot.arm
-boot_loader_mem=system.nvmem
+children=bridge cf0 cpu0 cpu1 intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver
+atags_addr=256
+boot_loader=/projects/pd/randd/dist/binaries/boot.arm
+boot_loader_mem=system.realview.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=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+kernel=/projects/pd/randd/dist/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
+memories=system.physmem system.realview.nvmem
 midr_regval=890224640
 num_work_ids=16
 physmem=system.physmem
@@ -32,18 +33,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_port=system.membus.slave[0]
 
 [system.bridge]
 type=Bridge
 delay=50000
 nack_delay=4000
-ranges=268435456:520093695 1073741824:18446744073709551615
+ranges=268435456:520093695 1073741824:1610612735
 req_size=16
 resp_size=16
 write_ack=false
-master=system.iobus.port[0]
-slave=system.membus.port[0]
+master=system.iobus.slave[0]
+slave=system.membus.master[0]
 
 [system.cf0]
 type=IdeDisk
@@ -62,7 +63,7 @@ table_size=65536
 
 [system.cf0.image.child]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-arm-ael.img
+image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img
 read_only=true
 
 [system.cpu0]
@@ -99,7 +100,7 @@ icache_port=system.cpu0.icache.cpu_side
 
 [system.cpu0.dcache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
 forward_snoops=true
@@ -120,7 +121,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu0.dcache_port
-mem_side=system.toL2Bus.port[2]
+mem_side=system.toL2Bus.slave[1]
 
 [system.cpu0.dtb]
 type=ArmTLB
@@ -133,11 +134,11 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[4]
+port=system.toL2Bus.slave[3]
 
 [system.cpu0.icache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=1
 block_size=64
 forward_snoops=true
@@ -158,7 +159,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu0.icache_port
-mem_side=system.toL2Bus.port[1]
+mem_side=system.toL2Bus.slave[0]
 
 [system.cpu0.interrupts]
 type=ArmInterrupts
@@ -174,7 +175,7 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[3]
+port=system.toL2Bus.slave[2]
 
 [system.cpu0.tracer]
 type=ExeTracer
@@ -213,7 +214,7 @@ icache_port=system.cpu1.icache.cpu_side
 
 [system.cpu1.dcache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
 forward_snoops=true
@@ -234,7 +235,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu1.dcache_port
-mem_side=system.toL2Bus.port[6]
+mem_side=system.toL2Bus.slave[5]
 
 [system.cpu1.dtb]
 type=ArmTLB
@@ -247,11 +248,11 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[8]
+port=system.toL2Bus.slave[7]
 
 [system.cpu1.icache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=1
 block_size=64
 forward_snoops=true
@@ -272,7 +273,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu1.icache_port
-mem_side=system.toL2Bus.port[5]
+mem_side=system.toL2Bus.slave[4]
 
 [system.cpu1.interrupts]
 type=ArmInterrupts
@@ -288,7 +289,7 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[7]
+port=system.toL2Bus.slave[6]
 
 [system.cpu1.tracer]
 type=ExeTracer
@@ -305,11 +306,12 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-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
+master=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.cf_ctrl.config 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
+slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma
 
 [system.iocache]
 type=BaseCache
-addr_range=0:268435455
+addr_ranges=0:268435455
 assoc=8
 block_size=64
 forward_snoops=false
@@ -329,12 +331,12 @@ tgts_per_mshr=12
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.iobus.port[28]
-mem_side=system.membus.port[8]
+cpu_side=system.iobus.master[25]
+mem_side=system.membus.slave[1]
 
 [system.l2c]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=8
 block_size=64
 forward_snoops=true
@@ -354,8 +356,8 @@ tgts_per_mshr=16
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.toL2Bus.port[0]
-mem_side=system.membus.port[9]
+cpu_side=system.toL2Bus.master[0]
+mem_side=system.membus.slave[2]
 
 [system.membus]
 type=Bus
@@ -367,7 +369,8 @@ header_cycles=1
 use_default_range=false
 width=64
 default=system.membus.badaddr_responder.pio
-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
+master=system.bridge.slave system.realview.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
+slave=system.system_port system.iocache.mem_side system.l2c.mem_side
 
 [system.membus.badaddr_responder]
 type=IsaFake
@@ -385,16 +388,6 @@ update_data=false
 warn_access=warn
 pio=system.membus.default
 
-[system.nvmem]
-type=PhysicalMemory
-file=
-latency=30000
-latency_var=0
-null=false
-range=2147483648:2214592511
-zero=true
-port=system.membus.port[1]
-
 [system.physmem]
 type=PhysicalMemory
 file=
@@ -402,13 +395,15 @@ latency=30000
 latency_var=0
 null=false
 range=0:134217727
-zero=true
-port=system.membus.port[2]
+zero=false
+port=system.membus.master[2]
 
 [system.realview]
 type=RealView
-children=a9scu aaci_fake cf_ctrl clcd dmac_fake flash_fake gic gpio0_fake gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake local_cpu_timer mmc_fake realview_io rtc_fake sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake watchdog_fake
+children=a9scu aaci_fake cf_ctrl clcd dmac_fake flash_fake gic gpio0_fake gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake local_cpu_timer mmc_fake nvmem realview_io rtc_fake sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake watchdog_fake
 intrctrl=system.intrctrl
+max_mem_size=268435456
+mem_start_addr=0
 pci_cfg_base=0
 system=system
 
@@ -417,7 +412,7 @@ type=A9SCU
 pio_addr=520093696
 pio_latency=1000
 system=system
-pio=system.membus.port[5]
+pio=system.membus.master[5]
 
 [system.realview.aaci_fake]
 type=AmbaFake
@@ -426,7 +421,7 @@ ignore_access=false
 pio_addr=268451840
 pio_latency=1000
 system=system
-pio=system.iobus.port[24]
+pio=system.iobus.master[21]
 
 [system.realview.cf_ctrl]
 type=IdeController
@@ -480,9 +475,9 @@ pci_func=0
 pio_latency=1000
 platform=system.realview
 system=system
-config=system.iobus.port[10]
-dma=system.iobus.port[11]
-pio=system.iobus.port[9]
+config=system.iobus.master[8]
+dma=system.iobus.slave[2]
+pio=system.iobus.master[7]
 
 [system.realview.clcd]
 type=Pl111
@@ -496,8 +491,8 @@ pio_addr=268566528
 pio_latency=10000
 system=system
 vnc=system.vncserver
-dma=system.iobus.port[6]
-pio=system.iobus.port[5]
+dma=system.iobus.slave[1]
+pio=system.iobus.master[4]
 
 [system.realview.dmac_fake]
 type=AmbaFake
@@ -506,7 +501,7 @@ ignore_access=false
 pio_addr=268632064
 pio_latency=1000
 system=system
-pio=system.iobus.port[12]
+pio=system.iobus.master[9]
 
 [system.realview.flash_fake]
 type=IsaFake
@@ -522,7 +517,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[27]
+pio=system.iobus.master[24]
 
 [system.realview.gic]
 type=Gic
@@ -534,7 +529,7 @@ int_latency=10000
 it_lines=128
 platform=system.realview
 system=system
-pio=system.membus.port[3]
+pio=system.membus.master[3]
 
 [system.realview.gpio0_fake]
 type=AmbaFake
@@ -543,7 +538,7 @@ ignore_access=false
 pio_addr=268513280
 pio_latency=1000
 system=system
-pio=system.iobus.port[19]
+pio=system.iobus.master[16]
 
 [system.realview.gpio1_fake]
 type=AmbaFake
@@ -552,7 +547,7 @@ ignore_access=false
 pio_addr=268517376
 pio_latency=1000
 system=system
-pio=system.iobus.port[20]
+pio=system.iobus.master[17]
 
 [system.realview.gpio2_fake]
 type=AmbaFake
@@ -561,7 +556,7 @@ ignore_access=false
 pio_addr=268521472
 pio_latency=1000
 system=system
-pio=system.iobus.port[21]
+pio=system.iobus.master[18]
 
 [system.realview.kmi0]
 type=Pl050
@@ -574,7 +569,7 @@ pio_addr=268460032
 pio_latency=1000
 system=system
 vnc=system.vncserver
-pio=system.iobus.port[7]
+pio=system.iobus.master[5]
 
 [system.realview.kmi1]
 type=Pl050
@@ -587,7 +582,7 @@ pio_addr=268464128
 pio_latency=1000
 system=system
 vnc=system.vncserver
-pio=system.iobus.port[8]
+pio=system.iobus.master[6]
 
 [system.realview.l2x0_fake]
 type=IsaFake
@@ -603,7 +598,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.membus.port[4]
+pio=system.membus.master[4]
 
 [system.realview.local_cpu_timer]
 type=CpuLocalTimer
@@ -614,7 +609,7 @@ int_num_watchdog=30
 pio_addr=520095232
 pio_latency=1000
 system=system
-pio=system.membus.port[6]
+pio=system.membus.master[6]
 
 [system.realview.mmc_fake]
 type=AmbaFake
@@ -623,7 +618,17 @@ ignore_access=false
 pio_addr=268455936
 pio_latency=1000
 system=system
-pio=system.iobus.port[25]
+pio=system.iobus.master[22]
+
+[system.realview.nvmem]
+type=PhysicalMemory
+file=
+latency=30000
+latency_var=0
+null=false
+range=2147483648:2214592511
+zero=true
+port=system.membus.master[1]
 
 [system.realview.realview_io]
 type=RealViewCtrl
@@ -633,7 +638,7 @@ pio_latency=1000
 proc_id0=201326592
 proc_id1=201327138
 system=system
-pio=system.iobus.port[2]
+pio=system.iobus.master[1]
 
 [system.realview.rtc_fake]
 type=AmbaFake
@@ -642,7 +647,7 @@ ignore_access=false
 pio_addr=268529664
 pio_latency=1000
 system=system
-pio=system.iobus.port[26]
+pio=system.iobus.master[23]
 
 [system.realview.sci_fake]
 type=AmbaFake
@@ -651,7 +656,7 @@ ignore_access=false
 pio_addr=268492800
 pio_latency=1000
 system=system
-pio=system.iobus.port[23]
+pio=system.iobus.master[20]
 
 [system.realview.smc_fake]
 type=AmbaFake
@@ -660,7 +665,7 @@ ignore_access=false
 pio_addr=269357056
 pio_latency=1000
 system=system
-pio=system.iobus.port[16]
+pio=system.iobus.master[13]
 
 [system.realview.sp810_fake]
 type=AmbaFake
@@ -669,7 +674,7 @@ ignore_access=true
 pio_addr=268439552
 pio_latency=1000
 system=system
-pio=system.iobus.port[17]
+pio=system.iobus.master[14]
 
 [system.realview.ssp_fake]
 type=AmbaFake
@@ -678,7 +683,7 @@ ignore_access=false
 pio_addr=268488704
 pio_latency=1000
 system=system
-pio=system.iobus.port[22]
+pio=system.iobus.master[19]
 
 [system.realview.timer0]
 type=Sp804
@@ -691,7 +696,7 @@ int_num1=36
 pio_addr=268505088
 pio_latency=1000
 system=system
-pio=system.iobus.port[3]
+pio=system.iobus.master[2]
 
 [system.realview.timer1]
 type=Sp804
@@ -704,7 +709,7 @@ int_num1=37
 pio_addr=268509184
 pio_latency=1000
 system=system
-pio=system.iobus.port[4]
+pio=system.iobus.master[3]
 
 [system.realview.uart]
 type=Pl011
@@ -717,7 +722,7 @@ pio_latency=1000
 platform=system.realview
 system=system
 terminal=system.terminal
-pio=system.iobus.port[1]
+pio=system.iobus.master[0]
 
 [system.realview.uart1_fake]
 type=AmbaFake
@@ -726,7 +731,7 @@ ignore_access=false
 pio_addr=268476416
 pio_latency=1000
 system=system
-pio=system.iobus.port[13]
+pio=system.iobus.master[10]
 
 [system.realview.uart2_fake]
 type=AmbaFake
@@ -735,7 +740,7 @@ ignore_access=false
 pio_addr=268480512
 pio_latency=1000
 system=system
-pio=system.iobus.port[14]
+pio=system.iobus.master[11]
 
 [system.realview.uart3_fake]
 type=AmbaFake
@@ -744,7 +749,7 @@ ignore_access=false
 pio_addr=268484608
 pio_latency=1000
 system=system
-pio=system.iobus.port[15]
+pio=system.iobus.master[12]
 
 [system.realview.watchdog_fake]
 type=AmbaFake
@@ -753,7 +758,7 @@ ignore_access=false
 pio_addr=268500992
 pio_latency=1000
 system=system
-pio=system.iobus.port[18]
+pio=system.iobus.master[15]
 
 [system.terminal]
 type=Terminal
@@ -770,7 +775,8 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-port=system.l2c.cpu_side system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu0.itb.walker.port system.cpu0.dtb.walker.port system.cpu1.icache.mem_side system.cpu1.dcache.mem_side system.cpu1.itb.walker.port system.cpu1.dtb.walker.port
+master=system.l2c.cpu_side
+slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu0.itb.walker.port system.cpu0.dtb.walker.port system.cpu1.icache.mem_side system.cpu1.dcache.mem_side system.cpu1.itb.walker.port system.cpu1.dtb.walker.port
 
 [system.vncserver]
 type=VncServer
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout
index 24932a89c..c5cc2bafe 100755
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout
@@ -1,12 +1,15 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Feb 12 2012 23:53:51
-gem5 started Feb 12 2012 23:54:00
-gem5 executing on zizzer
-command line: build/ARM/gem5.fast -d build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual -re tests/run.py build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual
+gem5 compiled Mar  9 2012 08:32:03
+gem5 started Mar  9 2012 08:33:32
+gem5 executing on u200540-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual -re tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual
+The currently selected ARM platforms doesn't support
+ the amount of DRAM you've selected. Please try
+ another platform
 Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 info: Using bootloader at address 0x80000000
 info: Entering event queue @ 0.  Starting simulation...
 Exiting @ tick 2411694099500 because m5_exit instruction encountered
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
index d07d7ec8c..a8278f7b9 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  2.411694                       # Nu
 sim_ticks                                2411694099500                       # Number of ticks simulated
 final_tick                               2411694099500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                2070187                       # Simulator instruction rate (inst/s)
-host_op_rate                                  2676186                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                            81119350138                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 376104                       # Number of bytes of host memory used
-host_seconds                                    29.73                       # Real time elapsed on the host
+host_inst_rate                                1397437                       # Simulator instruction rate (inst/s)
+host_op_rate                                  1806505                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                            54757981393                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 382236                       # Number of bytes of host memory used
+host_seconds                                    44.04                       # Real time elapsed on the host
 sim_insts                                    61546998                       # Number of instructions simulated
 sim_ops                                      79563488                       # Number of ops (including micro ops) simulated
 system.realview.nvmem.bytes_read                   68                       # Number of bytes read from this memory
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/status b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/status
index 10632c381..877c03770 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/status
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/status
@@ -1 +1 @@
-build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-atomic-dual FAILED!
+build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual passed.
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini
index 5cb72c285..6cc3c2484 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini
@@ -8,18 +8,19 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=LinuxArmSystem
-children=bridge cf0 cpu intrctrl iobus iocache l2c membus nvmem physmem realview terminal toL2Bus vncserver
-boot_loader=/dist/m5/system/binaries/boot.arm
-boot_loader_mem=system.nvmem
+children=bridge cf0 cpu intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver
+atags_addr=256
+boot_loader=/projects/pd/randd/dist/binaries/boot.arm
+boot_loader_mem=system.realview.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=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+kernel=/projects/pd/randd/dist/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
+memories=system.physmem system.realview.nvmem
 midr_regval=890224640
 num_work_ids=16
 physmem=system.physmem
@@ -32,18 +33,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_port=system.membus.slave[0]
 
 [system.bridge]
 type=Bridge
 delay=50000
 nack_delay=4000
-ranges=268435456:520093695 1073741824:18446744073709551615
+ranges=268435456:520093695 1073741824:1610612735
 req_size=16
 resp_size=16
 write_ack=false
-master=system.iobus.port[0]
-slave=system.membus.port[0]
+master=system.iobus.slave[0]
+slave=system.membus.master[0]
 
 [system.cf0]
 type=IdeDisk
@@ -62,7 +63,7 @@ table_size=65536
 
 [system.cf0.image.child]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-arm-ael.img
+image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img
 read_only=true
 
 [system.cpu]
@@ -99,7 +100,7 @@ icache_port=system.cpu.icache.cpu_side
 
 [system.cpu.dcache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
 forward_snoops=true
@@ -120,7 +121,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.dcache_port
-mem_side=system.toL2Bus.port[2]
+mem_side=system.toL2Bus.slave[1]
 
 [system.cpu.dtb]
 type=ArmTLB
@@ -133,11 +134,11 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[4]
+port=system.toL2Bus.slave[3]
 
 [system.cpu.icache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=1
 block_size=64
 forward_snoops=true
@@ -158,7 +159,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.icache_port
-mem_side=system.toL2Bus.port[1]
+mem_side=system.toL2Bus.slave[0]
 
 [system.cpu.interrupts]
 type=ArmInterrupts
@@ -174,7 +175,7 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[3]
+port=system.toL2Bus.slave[2]
 
 [system.cpu.tracer]
 type=ExeTracer
@@ -191,11 +192,12 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-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
+master=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.cf_ctrl.config 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
+slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma
 
 [system.iocache]
 type=BaseCache
-addr_range=0:268435455
+addr_ranges=0:268435455
 assoc=8
 block_size=64
 forward_snoops=false
@@ -215,12 +217,12 @@ tgts_per_mshr=12
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.iobus.port[28]
-mem_side=system.membus.port[8]
+cpu_side=system.iobus.master[25]
+mem_side=system.membus.slave[1]
 
 [system.l2c]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=8
 block_size=64
 forward_snoops=true
@@ -240,8 +242,8 @@ tgts_per_mshr=16
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.toL2Bus.port[0]
-mem_side=system.membus.port[9]
+cpu_side=system.toL2Bus.master[0]
+mem_side=system.membus.slave[2]
 
 [system.membus]
 type=Bus
@@ -253,7 +255,8 @@ header_cycles=1
 use_default_range=false
 width=64
 default=system.membus.badaddr_responder.pio
-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
+master=system.bridge.slave system.realview.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
+slave=system.system_port system.iocache.mem_side system.l2c.mem_side
 
 [system.membus.badaddr_responder]
 type=IsaFake
@@ -271,16 +274,6 @@ update_data=false
 warn_access=warn
 pio=system.membus.default
 
-[system.nvmem]
-type=PhysicalMemory
-file=
-latency=30000
-latency_var=0
-null=false
-range=2147483648:2214592511
-zero=true
-port=system.membus.port[1]
-
 [system.physmem]
 type=PhysicalMemory
 file=
@@ -288,13 +281,15 @@ latency=30000
 latency_var=0
 null=false
 range=0:134217727
-zero=true
-port=system.membus.port[2]
+zero=false
+port=system.membus.master[2]
 
 [system.realview]
 type=RealView
-children=a9scu aaci_fake cf_ctrl clcd dmac_fake flash_fake gic gpio0_fake gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake local_cpu_timer mmc_fake realview_io rtc_fake sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake watchdog_fake
+children=a9scu aaci_fake cf_ctrl clcd dmac_fake flash_fake gic gpio0_fake gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake local_cpu_timer mmc_fake nvmem realview_io rtc_fake sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake watchdog_fake
 intrctrl=system.intrctrl
+max_mem_size=268435456
+mem_start_addr=0
 pci_cfg_base=0
 system=system
 
@@ -303,7 +298,7 @@ type=A9SCU
 pio_addr=520093696
 pio_latency=1000
 system=system
-pio=system.membus.port[5]
+pio=system.membus.master[5]
 
 [system.realview.aaci_fake]
 type=AmbaFake
@@ -312,7 +307,7 @@ ignore_access=false
 pio_addr=268451840
 pio_latency=1000
 system=system
-pio=system.iobus.port[24]
+pio=system.iobus.master[21]
 
 [system.realview.cf_ctrl]
 type=IdeController
@@ -366,9 +361,9 @@ pci_func=0
 pio_latency=1000
 platform=system.realview
 system=system
-config=system.iobus.port[10]
-dma=system.iobus.port[11]
-pio=system.iobus.port[9]
+config=system.iobus.master[8]
+dma=system.iobus.slave[2]
+pio=system.iobus.master[7]
 
 [system.realview.clcd]
 type=Pl111
@@ -382,8 +377,8 @@ pio_addr=268566528
 pio_latency=10000
 system=system
 vnc=system.vncserver
-dma=system.iobus.port[6]
-pio=system.iobus.port[5]
+dma=system.iobus.slave[1]
+pio=system.iobus.master[4]
 
 [system.realview.dmac_fake]
 type=AmbaFake
@@ -392,7 +387,7 @@ ignore_access=false
 pio_addr=268632064
 pio_latency=1000
 system=system
-pio=system.iobus.port[12]
+pio=system.iobus.master[9]
 
 [system.realview.flash_fake]
 type=IsaFake
@@ -408,7 +403,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[27]
+pio=system.iobus.master[24]
 
 [system.realview.gic]
 type=Gic
@@ -420,7 +415,7 @@ int_latency=10000
 it_lines=128
 platform=system.realview
 system=system
-pio=system.membus.port[3]
+pio=system.membus.master[3]
 
 [system.realview.gpio0_fake]
 type=AmbaFake
@@ -429,7 +424,7 @@ ignore_access=false
 pio_addr=268513280
 pio_latency=1000
 system=system
-pio=system.iobus.port[19]
+pio=system.iobus.master[16]
 
 [system.realview.gpio1_fake]
 type=AmbaFake
@@ -438,7 +433,7 @@ ignore_access=false
 pio_addr=268517376
 pio_latency=1000
 system=system
-pio=system.iobus.port[20]
+pio=system.iobus.master[17]
 
 [system.realview.gpio2_fake]
 type=AmbaFake
@@ -447,7 +442,7 @@ ignore_access=false
 pio_addr=268521472
 pio_latency=1000
 system=system
-pio=system.iobus.port[21]
+pio=system.iobus.master[18]
 
 [system.realview.kmi0]
 type=Pl050
@@ -460,7 +455,7 @@ pio_addr=268460032
 pio_latency=1000
 system=system
 vnc=system.vncserver
-pio=system.iobus.port[7]
+pio=system.iobus.master[5]
 
 [system.realview.kmi1]
 type=Pl050
@@ -473,7 +468,7 @@ pio_addr=268464128
 pio_latency=1000
 system=system
 vnc=system.vncserver
-pio=system.iobus.port[8]
+pio=system.iobus.master[6]
 
 [system.realview.l2x0_fake]
 type=IsaFake
@@ -489,7 +484,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.membus.port[4]
+pio=system.membus.master[4]
 
 [system.realview.local_cpu_timer]
 type=CpuLocalTimer
@@ -500,7 +495,7 @@ int_num_watchdog=30
 pio_addr=520095232
 pio_latency=1000
 system=system
-pio=system.membus.port[6]
+pio=system.membus.master[6]
 
 [system.realview.mmc_fake]
 type=AmbaFake
@@ -509,7 +504,17 @@ ignore_access=false
 pio_addr=268455936
 pio_latency=1000
 system=system
-pio=system.iobus.port[25]
+pio=system.iobus.master[22]
+
+[system.realview.nvmem]
+type=PhysicalMemory
+file=
+latency=30000
+latency_var=0
+null=false
+range=2147483648:2214592511
+zero=true
+port=system.membus.master[1]
 
 [system.realview.realview_io]
 type=RealViewCtrl
@@ -519,7 +524,7 @@ pio_latency=1000
 proc_id0=201326592
 proc_id1=201327138
 system=system
-pio=system.iobus.port[2]
+pio=system.iobus.master[1]
 
 [system.realview.rtc_fake]
 type=AmbaFake
@@ -528,7 +533,7 @@ ignore_access=false
 pio_addr=268529664
 pio_latency=1000
 system=system
-pio=system.iobus.port[26]
+pio=system.iobus.master[23]
 
 [system.realview.sci_fake]
 type=AmbaFake
@@ -537,7 +542,7 @@ ignore_access=false
 pio_addr=268492800
 pio_latency=1000
 system=system
-pio=system.iobus.port[23]
+pio=system.iobus.master[20]
 
 [system.realview.smc_fake]
 type=AmbaFake
@@ -546,7 +551,7 @@ ignore_access=false
 pio_addr=269357056
 pio_latency=1000
 system=system
-pio=system.iobus.port[16]
+pio=system.iobus.master[13]
 
 [system.realview.sp810_fake]
 type=AmbaFake
@@ -555,7 +560,7 @@ ignore_access=true
 pio_addr=268439552
 pio_latency=1000
 system=system
-pio=system.iobus.port[17]
+pio=system.iobus.master[14]
 
 [system.realview.ssp_fake]
 type=AmbaFake
@@ -564,7 +569,7 @@ ignore_access=false
 pio_addr=268488704
 pio_latency=1000
 system=system
-pio=system.iobus.port[22]
+pio=system.iobus.master[19]
 
 [system.realview.timer0]
 type=Sp804
@@ -577,7 +582,7 @@ int_num1=36
 pio_addr=268505088
 pio_latency=1000
 system=system
-pio=system.iobus.port[3]
+pio=system.iobus.master[2]
 
 [system.realview.timer1]
 type=Sp804
@@ -590,7 +595,7 @@ int_num1=37
 pio_addr=268509184
 pio_latency=1000
 system=system
-pio=system.iobus.port[4]
+pio=system.iobus.master[3]
 
 [system.realview.uart]
 type=Pl011
@@ -603,7 +608,7 @@ pio_latency=1000
 platform=system.realview
 system=system
 terminal=system.terminal
-pio=system.iobus.port[1]
+pio=system.iobus.master[0]
 
 [system.realview.uart1_fake]
 type=AmbaFake
@@ -612,7 +617,7 @@ ignore_access=false
 pio_addr=268476416
 pio_latency=1000
 system=system
-pio=system.iobus.port[13]
+pio=system.iobus.master[10]
 
 [system.realview.uart2_fake]
 type=AmbaFake
@@ -621,7 +626,7 @@ ignore_access=false
 pio_addr=268480512
 pio_latency=1000
 system=system
-pio=system.iobus.port[14]
+pio=system.iobus.master[11]
 
 [system.realview.uart3_fake]
 type=AmbaFake
@@ -630,7 +635,7 @@ ignore_access=false
 pio_addr=268484608
 pio_latency=1000
 system=system
-pio=system.iobus.port[15]
+pio=system.iobus.master[12]
 
 [system.realview.watchdog_fake]
 type=AmbaFake
@@ -639,7 +644,7 @@ ignore_access=false
 pio_addr=268500992
 pio_latency=1000
 system=system
-pio=system.iobus.port[18]
+pio=system.iobus.master[15]
 
 [system.terminal]
 type=Terminal
@@ -656,7 +661,8 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-port=system.l2c.cpu_side system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
+master=system.l2c.cpu_side
+slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
 [system.vncserver]
 type=VncServer
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout
index 31542346f..32fe1f3d3 100755
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout
@@ -1,12 +1,15 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Feb 11 2012 13:10:40
-gem5 started Feb 11 2012 15:36:22
-gem5 executing on zizzer
-command line: build/ARM/gem5.fast -d build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic -re tests/run.py build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic
+gem5 compiled Mar  9 2012 08:32:03
+gem5 started Mar  9 2012 08:33:32
+gem5 executing on u200540-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic -re tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic
+The currently selected ARM platforms doesn't support
+ the amount of DRAM you've selected. Please try
+ another platform
 Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 info: Using bootloader at address 0x80000000
 info: Entering event queue @ 0.  Starting simulation...
 Exiting @ tick 2332316587000 because m5_exit instruction encountered
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt
index 7c245208d..38cf5a959 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  2.332317                       # Nu
 sim_ticks                                2332316587000                       # Number of ticks simulated
 final_tick                               2332316587000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                2011652                       # Simulator instruction rate (inst/s)
-host_op_rate                                  2597875                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                            79169370264                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 376316                       # Number of bytes of host memory used
-host_seconds                                    29.46                       # Real time elapsed on the host
+host_inst_rate                                1602803                       # Simulator instruction rate (inst/s)
+host_op_rate                                  2069882                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                            63078962864                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 382192                       # Number of bytes of host memory used
+host_seconds                                    36.97                       # Real time elapsed on the host
 sim_insts                                    59262876                       # Number of instructions simulated
 sim_ops                                      76532931                       # Number of ops (including micro ops) simulated
 system.realview.nvmem.bytes_read                   20                       # Number of bytes read from this memory
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/status b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/status
index 586cb6b73..3643c334f 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/status
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/status
@@ -1 +1 @@
-build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-atomic FAILED!
+build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic passed.
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini
index 73f5e0c76..266856004 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini
@@ -8,18 +8,19 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=LinuxArmSystem
-children=bridge cf0 cpu0 cpu1 intrctrl iobus iocache l2c membus nvmem physmem realview terminal toL2Bus vncserver
-boot_loader=/dist/m5/system/binaries/boot.arm
-boot_loader_mem=system.nvmem
+children=bridge cf0 cpu0 cpu1 intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver
+atags_addr=256
+boot_loader=/projects/pd/randd/dist/binaries/boot.arm
+boot_loader_mem=system.realview.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=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+kernel=/projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 load_addr_mask=268435455
 machine_type=RealView_PBX
 mem_mode=timing
-memories=system.nvmem system.physmem
+memories=system.physmem system.realview.nvmem
 midr_regval=890224640
 num_work_ids=16
 physmem=system.physmem
@@ -32,18 +33,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_port=system.membus.slave[0]
 
 [system.bridge]
 type=Bridge
 delay=50000
 nack_delay=4000
-ranges=268435456:520093695 1073741824:18446744073709551615
+ranges=268435456:520093695 1073741824:1610612735
 req_size=16
 resp_size=16
 write_ack=false
-master=system.iobus.port[0]
-slave=system.membus.port[0]
+master=system.iobus.slave[0]
+slave=system.membus.master[0]
 
 [system.cf0]
 type=IdeDisk
@@ -62,7 +63,7 @@ table_size=65536
 
 [system.cf0.image.child]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-arm-ael.img
+image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img
 read_only=true
 
 [system.cpu0]
@@ -96,7 +97,7 @@ icache_port=system.cpu0.icache.cpu_side
 
 [system.cpu0.dcache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
 forward_snoops=true
@@ -117,7 +118,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu0.dcache_port
-mem_side=system.toL2Bus.port[2]
+mem_side=system.toL2Bus.slave[1]
 
 [system.cpu0.dtb]
 type=ArmTLB
@@ -130,11 +131,11 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[4]
+port=system.toL2Bus.slave[3]
 
 [system.cpu0.icache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=1
 block_size=64
 forward_snoops=true
@@ -155,7 +156,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu0.icache_port
-mem_side=system.toL2Bus.port[1]
+mem_side=system.toL2Bus.slave[0]
 
 [system.cpu0.interrupts]
 type=ArmInterrupts
@@ -171,7 +172,7 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[3]
+port=system.toL2Bus.slave[2]
 
 [system.cpu0.tracer]
 type=ExeTracer
@@ -207,7 +208,7 @@ icache_port=system.cpu1.icache.cpu_side
 
 [system.cpu1.dcache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
 forward_snoops=true
@@ -228,7 +229,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu1.dcache_port
-mem_side=system.toL2Bus.port[6]
+mem_side=system.toL2Bus.slave[5]
 
 [system.cpu1.dtb]
 type=ArmTLB
@@ -241,11 +242,11 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[8]
+port=system.toL2Bus.slave[7]
 
 [system.cpu1.icache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=1
 block_size=64
 forward_snoops=true
@@ -266,7 +267,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu1.icache_port
-mem_side=system.toL2Bus.port[5]
+mem_side=system.toL2Bus.slave[4]
 
 [system.cpu1.interrupts]
 type=ArmInterrupts
@@ -282,7 +283,7 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[7]
+port=system.toL2Bus.slave[6]
 
 [system.cpu1.tracer]
 type=ExeTracer
@@ -299,11 +300,12 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-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
+master=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.cf_ctrl.config 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
+slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma
 
 [system.iocache]
 type=BaseCache
-addr_range=0:268435455
+addr_ranges=0:268435455
 assoc=8
 block_size=64
 forward_snoops=false
@@ -323,12 +325,12 @@ tgts_per_mshr=12
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.iobus.port[28]
-mem_side=system.membus.port[8]
+cpu_side=system.iobus.master[25]
+mem_side=system.membus.slave[1]
 
 [system.l2c]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=8
 block_size=64
 forward_snoops=true
@@ -348,8 +350,8 @@ tgts_per_mshr=16
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.toL2Bus.port[0]
-mem_side=system.membus.port[9]
+cpu_side=system.toL2Bus.master[0]
+mem_side=system.membus.slave[2]
 
 [system.membus]
 type=Bus
@@ -361,7 +363,8 @@ header_cycles=1
 use_default_range=false
 width=64
 default=system.membus.badaddr_responder.pio
-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
+master=system.bridge.slave system.realview.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
+slave=system.system_port system.iocache.mem_side system.l2c.mem_side
 
 [system.membus.badaddr_responder]
 type=IsaFake
@@ -379,16 +382,6 @@ update_data=false
 warn_access=warn
 pio=system.membus.default
 
-[system.nvmem]
-type=PhysicalMemory
-file=
-latency=30000
-latency_var=0
-null=false
-range=2147483648:2214592511
-zero=true
-port=system.membus.port[1]
-
 [system.physmem]
 type=PhysicalMemory
 file=
@@ -396,13 +389,15 @@ latency=30000
 latency_var=0
 null=false
 range=0:134217727
-zero=true
-port=system.membus.port[2]
+zero=false
+port=system.membus.master[2]
 
 [system.realview]
 type=RealView
-children=a9scu aaci_fake cf_ctrl clcd dmac_fake flash_fake gic gpio0_fake gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake local_cpu_timer mmc_fake realview_io rtc_fake sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake watchdog_fake
+children=a9scu aaci_fake cf_ctrl clcd dmac_fake flash_fake gic gpio0_fake gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake local_cpu_timer mmc_fake nvmem realview_io rtc_fake sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake watchdog_fake
 intrctrl=system.intrctrl
+max_mem_size=268435456
+mem_start_addr=0
 pci_cfg_base=0
 system=system
 
@@ -411,7 +406,7 @@ type=A9SCU
 pio_addr=520093696
 pio_latency=1000
 system=system
-pio=system.membus.port[5]
+pio=system.membus.master[5]
 
 [system.realview.aaci_fake]
 type=AmbaFake
@@ -420,7 +415,7 @@ ignore_access=false
 pio_addr=268451840
 pio_latency=1000
 system=system
-pio=system.iobus.port[24]
+pio=system.iobus.master[21]
 
 [system.realview.cf_ctrl]
 type=IdeController
@@ -474,9 +469,9 @@ pci_func=0
 pio_latency=1000
 platform=system.realview
 system=system
-config=system.iobus.port[10]
-dma=system.iobus.port[11]
-pio=system.iobus.port[9]
+config=system.iobus.master[8]
+dma=system.iobus.slave[2]
+pio=system.iobus.master[7]
 
 [system.realview.clcd]
 type=Pl111
@@ -490,8 +485,8 @@ pio_addr=268566528
 pio_latency=10000
 system=system
 vnc=system.vncserver
-dma=system.iobus.port[6]
-pio=system.iobus.port[5]
+dma=system.iobus.slave[1]
+pio=system.iobus.master[4]
 
 [system.realview.dmac_fake]
 type=AmbaFake
@@ -500,7 +495,7 @@ ignore_access=false
 pio_addr=268632064
 pio_latency=1000
 system=system
-pio=system.iobus.port[12]
+pio=system.iobus.master[9]
 
 [system.realview.flash_fake]
 type=IsaFake
@@ -516,7 +511,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[27]
+pio=system.iobus.master[24]
 
 [system.realview.gic]
 type=Gic
@@ -528,7 +523,7 @@ int_latency=10000
 it_lines=128
 platform=system.realview
 system=system
-pio=system.membus.port[3]
+pio=system.membus.master[3]
 
 [system.realview.gpio0_fake]
 type=AmbaFake
@@ -537,7 +532,7 @@ ignore_access=false
 pio_addr=268513280
 pio_latency=1000
 system=system
-pio=system.iobus.port[19]
+pio=system.iobus.master[16]
 
 [system.realview.gpio1_fake]
 type=AmbaFake
@@ -546,7 +541,7 @@ ignore_access=false
 pio_addr=268517376
 pio_latency=1000
 system=system
-pio=system.iobus.port[20]
+pio=system.iobus.master[17]
 
 [system.realview.gpio2_fake]
 type=AmbaFake
@@ -555,7 +550,7 @@ ignore_access=false
 pio_addr=268521472
 pio_latency=1000
 system=system
-pio=system.iobus.port[21]
+pio=system.iobus.master[18]
 
 [system.realview.kmi0]
 type=Pl050
@@ -568,7 +563,7 @@ pio_addr=268460032
 pio_latency=1000
 system=system
 vnc=system.vncserver
-pio=system.iobus.port[7]
+pio=system.iobus.master[5]
 
 [system.realview.kmi1]
 type=Pl050
@@ -581,7 +576,7 @@ pio_addr=268464128
 pio_latency=1000
 system=system
 vnc=system.vncserver
-pio=system.iobus.port[8]
+pio=system.iobus.master[6]
 
 [system.realview.l2x0_fake]
 type=IsaFake
@@ -597,7 +592,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.membus.port[4]
+pio=system.membus.master[4]
 
 [system.realview.local_cpu_timer]
 type=CpuLocalTimer
@@ -608,7 +603,7 @@ int_num_watchdog=30
 pio_addr=520095232
 pio_latency=1000
 system=system
-pio=system.membus.port[6]
+pio=system.membus.master[6]
 
 [system.realview.mmc_fake]
 type=AmbaFake
@@ -617,7 +612,17 @@ ignore_access=false
 pio_addr=268455936
 pio_latency=1000
 system=system
-pio=system.iobus.port[25]
+pio=system.iobus.master[22]
+
+[system.realview.nvmem]
+type=PhysicalMemory
+file=
+latency=30000
+latency_var=0
+null=false
+range=2147483648:2214592511
+zero=true
+port=system.membus.master[1]
 
 [system.realview.realview_io]
 type=RealViewCtrl
@@ -627,7 +632,7 @@ pio_latency=1000
 proc_id0=201326592
 proc_id1=201327138
 system=system
-pio=system.iobus.port[2]
+pio=system.iobus.master[1]
 
 [system.realview.rtc_fake]
 type=AmbaFake
@@ -636,7 +641,7 @@ ignore_access=false
 pio_addr=268529664
 pio_latency=1000
 system=system
-pio=system.iobus.port[26]
+pio=system.iobus.master[23]
 
 [system.realview.sci_fake]
 type=AmbaFake
@@ -645,7 +650,7 @@ ignore_access=false
 pio_addr=268492800
 pio_latency=1000
 system=system
-pio=system.iobus.port[23]
+pio=system.iobus.master[20]
 
 [system.realview.smc_fake]
 type=AmbaFake
@@ -654,7 +659,7 @@ ignore_access=false
 pio_addr=269357056
 pio_latency=1000
 system=system
-pio=system.iobus.port[16]
+pio=system.iobus.master[13]
 
 [system.realview.sp810_fake]
 type=AmbaFake
@@ -663,7 +668,7 @@ ignore_access=true
 pio_addr=268439552
 pio_latency=1000
 system=system
-pio=system.iobus.port[17]
+pio=system.iobus.master[14]
 
 [system.realview.ssp_fake]
 type=AmbaFake
@@ -672,7 +677,7 @@ ignore_access=false
 pio_addr=268488704
 pio_latency=1000
 system=system
-pio=system.iobus.port[22]
+pio=system.iobus.master[19]
 
 [system.realview.timer0]
 type=Sp804
@@ -685,7 +690,7 @@ int_num1=36
 pio_addr=268505088
 pio_latency=1000
 system=system
-pio=system.iobus.port[3]
+pio=system.iobus.master[2]
 
 [system.realview.timer1]
 type=Sp804
@@ -698,7 +703,7 @@ int_num1=37
 pio_addr=268509184
 pio_latency=1000
 system=system
-pio=system.iobus.port[4]
+pio=system.iobus.master[3]
 
 [system.realview.uart]
 type=Pl011
@@ -711,7 +716,7 @@ pio_latency=1000
 platform=system.realview
 system=system
 terminal=system.terminal
-pio=system.iobus.port[1]
+pio=system.iobus.master[0]
 
 [system.realview.uart1_fake]
 type=AmbaFake
@@ -720,7 +725,7 @@ ignore_access=false
 pio_addr=268476416
 pio_latency=1000
 system=system
-pio=system.iobus.port[13]
+pio=system.iobus.master[10]
 
 [system.realview.uart2_fake]
 type=AmbaFake
@@ -729,7 +734,7 @@ ignore_access=false
 pio_addr=268480512
 pio_latency=1000
 system=system
-pio=system.iobus.port[14]
+pio=system.iobus.master[11]
 
 [system.realview.uart3_fake]
 type=AmbaFake
@@ -738,7 +743,7 @@ ignore_access=false
 pio_addr=268484608
 pio_latency=1000
 system=system
-pio=system.iobus.port[15]
+pio=system.iobus.master[12]
 
 [system.realview.watchdog_fake]
 type=AmbaFake
@@ -747,7 +752,7 @@ ignore_access=false
 pio_addr=268500992
 pio_latency=1000
 system=system
-pio=system.iobus.port[18]
+pio=system.iobus.master[15]
 
 [system.terminal]
 type=Terminal
@@ -764,7 +769,8 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-port=system.l2c.cpu_side system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu0.itb.walker.port system.cpu0.dtb.walker.port system.cpu1.icache.mem_side system.cpu1.dcache.mem_side system.cpu1.itb.walker.port system.cpu1.dtb.walker.port
+master=system.l2c.cpu_side
+slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu0.itb.walker.port system.cpu0.dtb.walker.port system.cpu1.icache.mem_side system.cpu1.dcache.mem_side system.cpu1.itb.walker.port system.cpu1.dtb.walker.port
 
 [system.vncserver]
 type=VncServer
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout
index 83064ae1d..cdc402d36 100755
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout
@@ -1,12 +1,15 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Feb 11 2012 13:10:40
-gem5 started Feb 11 2012 15:38:22
-gem5 executing on zizzer
-command line: build/ARM/gem5.fast -d build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual -re tests/run.py build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual
+gem5 compiled Mar  9 2012 08:32:03
+gem5 started Mar  9 2012 08:33:32
+gem5 executing on u200540-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual -re tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual
+The currently selected ARM platforms doesn't support
+ the amount of DRAM you've selected. Please try
+ another platform
 Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 info: Using bootloader at address 0x80000000
 info: Entering event queue @ 0.  Starting simulation...
 Exiting @ tick 2669611225000 because m5_exit instruction encountered
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt
index 362a8aac4..415456c85 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  2.669611                       # Nu
 sim_ticks                                2669611225000                       # Number of ticks simulated
 final_tick                               2669611225000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 868396                       # Simulator instruction rate (inst/s)
-host_op_rate                                  1110924                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                            37821516206                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 377896                       # Number of bytes of host memory used
-host_seconds                                    70.58                       # Real time elapsed on the host
+host_inst_rate                                 656752                       # Simulator instruction rate (inst/s)
+host_op_rate                                   840171                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                            28603719755                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 384032                       # Number of bytes of host memory used
+host_seconds                                    93.33                       # Real time elapsed on the host
 sim_insts                                    61295262                       # Number of instructions simulated
 sim_ops                                      78413959                       # Number of ops (including micro ops) simulated
 system.realview.nvmem.bytes_read                   68                       # Number of bytes read from this memory
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/status b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/status
index 9e24c3e8a..d529dbd88 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/status
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/status
@@ -1 +1 @@
-build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-timing-dual FAILED!
+build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual passed.
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini
index 49efd7ba0..064eb9907 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini
@@ -8,18 +8,19 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=LinuxArmSystem
-children=bridge cf0 cpu intrctrl iobus iocache l2c membus nvmem physmem realview terminal toL2Bus vncserver
-boot_loader=/dist/m5/system/binaries/boot.arm
-boot_loader_mem=system.nvmem
+children=bridge cf0 cpu intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver
+atags_addr=256
+boot_loader=/projects/pd/randd/dist/binaries/boot.arm
+boot_loader_mem=system.realview.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=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+kernel=/projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 load_addr_mask=268435455
 machine_type=RealView_PBX
 mem_mode=timing
-memories=system.nvmem system.physmem
+memories=system.physmem system.realview.nvmem
 midr_regval=890224640
 num_work_ids=16
 physmem=system.physmem
@@ -32,18 +33,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_port=system.membus.slave[0]
 
 [system.bridge]
 type=Bridge
 delay=50000
 nack_delay=4000
-ranges=268435456:520093695 1073741824:18446744073709551615
+ranges=268435456:520093695 1073741824:1610612735
 req_size=16
 resp_size=16
 write_ack=false
-master=system.iobus.port[0]
-slave=system.membus.port[0]
+master=system.iobus.slave[0]
+slave=system.membus.master[0]
 
 [system.cf0]
 type=IdeDisk
@@ -62,7 +63,7 @@ table_size=65536
 
 [system.cf0.image.child]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-arm-ael.img
+image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img
 read_only=true
 
 [system.cpu]
@@ -96,7 +97,7 @@ icache_port=system.cpu.icache.cpu_side
 
 [system.cpu.dcache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
 forward_snoops=true
@@ -117,7 +118,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.dcache_port
-mem_side=system.toL2Bus.port[2]
+mem_side=system.toL2Bus.slave[1]
 
 [system.cpu.dtb]
 type=ArmTLB
@@ -130,11 +131,11 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[4]
+port=system.toL2Bus.slave[3]
 
 [system.cpu.icache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=1
 block_size=64
 forward_snoops=true
@@ -155,7 +156,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.icache_port
-mem_side=system.toL2Bus.port[1]
+mem_side=system.toL2Bus.slave[0]
 
 [system.cpu.interrupts]
 type=ArmInterrupts
@@ -171,7 +172,7 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.toL2Bus.port[3]
+port=system.toL2Bus.slave[2]
 
 [system.cpu.tracer]
 type=ExeTracer
@@ -188,11 +189,12 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-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
+master=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.cf_ctrl.config 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
+slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma
 
 [system.iocache]
 type=BaseCache
-addr_range=0:268435455
+addr_ranges=0:268435455
 assoc=8
 block_size=64
 forward_snoops=false
@@ -212,12 +214,12 @@ tgts_per_mshr=12
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.iobus.port[28]
-mem_side=system.membus.port[8]
+cpu_side=system.iobus.master[25]
+mem_side=system.membus.slave[1]
 
 [system.l2c]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=8
 block_size=64
 forward_snoops=true
@@ -237,8 +239,8 @@ tgts_per_mshr=16
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.toL2Bus.port[0]
-mem_side=system.membus.port[9]
+cpu_side=system.toL2Bus.master[0]
+mem_side=system.membus.slave[2]
 
 [system.membus]
 type=Bus
@@ -250,7 +252,8 @@ header_cycles=1
 use_default_range=false
 width=64
 default=system.membus.badaddr_responder.pio
-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
+master=system.bridge.slave system.realview.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
+slave=system.system_port system.iocache.mem_side system.l2c.mem_side
 
 [system.membus.badaddr_responder]
 type=IsaFake
@@ -268,16 +271,6 @@ update_data=false
 warn_access=warn
 pio=system.membus.default
 
-[system.nvmem]
-type=PhysicalMemory
-file=
-latency=30000
-latency_var=0
-null=false
-range=2147483648:2214592511
-zero=true
-port=system.membus.port[1]
-
 [system.physmem]
 type=PhysicalMemory
 file=
@@ -285,13 +278,15 @@ latency=30000
 latency_var=0
 null=false
 range=0:134217727
-zero=true
-port=system.membus.port[2]
+zero=false
+port=system.membus.master[2]
 
 [system.realview]
 type=RealView
-children=a9scu aaci_fake cf_ctrl clcd dmac_fake flash_fake gic gpio0_fake gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake local_cpu_timer mmc_fake realview_io rtc_fake sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake watchdog_fake
+children=a9scu aaci_fake cf_ctrl clcd dmac_fake flash_fake gic gpio0_fake gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake local_cpu_timer mmc_fake nvmem realview_io rtc_fake sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake watchdog_fake
 intrctrl=system.intrctrl
+max_mem_size=268435456
+mem_start_addr=0
 pci_cfg_base=0
 system=system
 
@@ -300,7 +295,7 @@ type=A9SCU
 pio_addr=520093696
 pio_latency=1000
 system=system
-pio=system.membus.port[5]
+pio=system.membus.master[5]
 
 [system.realview.aaci_fake]
 type=AmbaFake
@@ -309,7 +304,7 @@ ignore_access=false
 pio_addr=268451840
 pio_latency=1000
 system=system
-pio=system.iobus.port[24]
+pio=system.iobus.master[21]
 
 [system.realview.cf_ctrl]
 type=IdeController
@@ -363,9 +358,9 @@ pci_func=0
 pio_latency=1000
 platform=system.realview
 system=system
-config=system.iobus.port[10]
-dma=system.iobus.port[11]
-pio=system.iobus.port[9]
+config=system.iobus.master[8]
+dma=system.iobus.slave[2]
+pio=system.iobus.master[7]
 
 [system.realview.clcd]
 type=Pl111
@@ -379,8 +374,8 @@ pio_addr=268566528
 pio_latency=10000
 system=system
 vnc=system.vncserver
-dma=system.iobus.port[6]
-pio=system.iobus.port[5]
+dma=system.iobus.slave[1]
+pio=system.iobus.master[4]
 
 [system.realview.dmac_fake]
 type=AmbaFake
@@ -389,7 +384,7 @@ ignore_access=false
 pio_addr=268632064
 pio_latency=1000
 system=system
-pio=system.iobus.port[12]
+pio=system.iobus.master[9]
 
 [system.realview.flash_fake]
 type=IsaFake
@@ -405,7 +400,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[27]
+pio=system.iobus.master[24]
 
 [system.realview.gic]
 type=Gic
@@ -417,7 +412,7 @@ int_latency=10000
 it_lines=128
 platform=system.realview
 system=system
-pio=system.membus.port[3]
+pio=system.membus.master[3]
 
 [system.realview.gpio0_fake]
 type=AmbaFake
@@ -426,7 +421,7 @@ ignore_access=false
 pio_addr=268513280
 pio_latency=1000
 system=system
-pio=system.iobus.port[19]
+pio=system.iobus.master[16]
 
 [system.realview.gpio1_fake]
 type=AmbaFake
@@ -435,7 +430,7 @@ ignore_access=false
 pio_addr=268517376
 pio_latency=1000
 system=system
-pio=system.iobus.port[20]
+pio=system.iobus.master[17]
 
 [system.realview.gpio2_fake]
 type=AmbaFake
@@ -444,7 +439,7 @@ ignore_access=false
 pio_addr=268521472
 pio_latency=1000
 system=system
-pio=system.iobus.port[21]
+pio=system.iobus.master[18]
 
 [system.realview.kmi0]
 type=Pl050
@@ -457,7 +452,7 @@ pio_addr=268460032
 pio_latency=1000
 system=system
 vnc=system.vncserver
-pio=system.iobus.port[7]
+pio=system.iobus.master[5]
 
 [system.realview.kmi1]
 type=Pl050
@@ -470,7 +465,7 @@ pio_addr=268464128
 pio_latency=1000
 system=system
 vnc=system.vncserver
-pio=system.iobus.port[8]
+pio=system.iobus.master[6]
 
 [system.realview.l2x0_fake]
 type=IsaFake
@@ -486,7 +481,7 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.membus.port[4]
+pio=system.membus.master[4]
 
 [system.realview.local_cpu_timer]
 type=CpuLocalTimer
@@ -497,7 +492,7 @@ int_num_watchdog=30
 pio_addr=520095232
 pio_latency=1000
 system=system
-pio=system.membus.port[6]
+pio=system.membus.master[6]
 
 [system.realview.mmc_fake]
 type=AmbaFake
@@ -506,7 +501,17 @@ ignore_access=false
 pio_addr=268455936
 pio_latency=1000
 system=system
-pio=system.iobus.port[25]
+pio=system.iobus.master[22]
+
+[system.realview.nvmem]
+type=PhysicalMemory
+file=
+latency=30000
+latency_var=0
+null=false
+range=2147483648:2214592511
+zero=true
+port=system.membus.master[1]
 
 [system.realview.realview_io]
 type=RealViewCtrl
@@ -516,7 +521,7 @@ pio_latency=1000
 proc_id0=201326592
 proc_id1=201327138
 system=system
-pio=system.iobus.port[2]
+pio=system.iobus.master[1]
 
 [system.realview.rtc_fake]
 type=AmbaFake
@@ -525,7 +530,7 @@ ignore_access=false
 pio_addr=268529664
 pio_latency=1000
 system=system
-pio=system.iobus.port[26]
+pio=system.iobus.master[23]
 
 [system.realview.sci_fake]
 type=AmbaFake
@@ -534,7 +539,7 @@ ignore_access=false
 pio_addr=268492800
 pio_latency=1000
 system=system
-pio=system.iobus.port[23]
+pio=system.iobus.master[20]
 
 [system.realview.smc_fake]
 type=AmbaFake
@@ -543,7 +548,7 @@ ignore_access=false
 pio_addr=269357056
 pio_latency=1000
 system=system
-pio=system.iobus.port[16]
+pio=system.iobus.master[13]
 
 [system.realview.sp810_fake]
 type=AmbaFake
@@ -552,7 +557,7 @@ ignore_access=true
 pio_addr=268439552
 pio_latency=1000
 system=system
-pio=system.iobus.port[17]
+pio=system.iobus.master[14]
 
 [system.realview.ssp_fake]
 type=AmbaFake
@@ -561,7 +566,7 @@ ignore_access=false
 pio_addr=268488704
 pio_latency=1000
 system=system
-pio=system.iobus.port[22]
+pio=system.iobus.master[19]
 
 [system.realview.timer0]
 type=Sp804
@@ -574,7 +579,7 @@ int_num1=36
 pio_addr=268505088
 pio_latency=1000
 system=system
-pio=system.iobus.port[3]
+pio=system.iobus.master[2]
 
 [system.realview.timer1]
 type=Sp804
@@ -587,7 +592,7 @@ int_num1=37
 pio_addr=268509184
 pio_latency=1000
 system=system
-pio=system.iobus.port[4]
+pio=system.iobus.master[3]
 
 [system.realview.uart]
 type=Pl011
@@ -600,7 +605,7 @@ pio_latency=1000
 platform=system.realview
 system=system
 terminal=system.terminal
-pio=system.iobus.port[1]
+pio=system.iobus.master[0]
 
 [system.realview.uart1_fake]
 type=AmbaFake
@@ -609,7 +614,7 @@ ignore_access=false
 pio_addr=268476416
 pio_latency=1000
 system=system
-pio=system.iobus.port[13]
+pio=system.iobus.master[10]
 
 [system.realview.uart2_fake]
 type=AmbaFake
@@ -618,7 +623,7 @@ ignore_access=false
 pio_addr=268480512
 pio_latency=1000
 system=system
-pio=system.iobus.port[14]
+pio=system.iobus.master[11]
 
 [system.realview.uart3_fake]
 type=AmbaFake
@@ -627,7 +632,7 @@ ignore_access=false
 pio_addr=268484608
 pio_latency=1000
 system=system
-pio=system.iobus.port[15]
+pio=system.iobus.master[12]
 
 [system.realview.watchdog_fake]
 type=AmbaFake
@@ -636,7 +641,7 @@ ignore_access=false
 pio_addr=268500992
 pio_latency=1000
 system=system
-pio=system.iobus.port[18]
+pio=system.iobus.master[15]
 
 [system.terminal]
 type=Terminal
@@ -653,7 +658,8 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-port=system.l2c.cpu_side system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
+master=system.l2c.cpu_side
+slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
 [system.vncserver]
 type=VncServer
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout
index af233a80c..c88a5bef6 100755
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout
@@ -1,12 +1,15 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Feb 11 2012 13:10:40
-gem5 started Feb 11 2012 15:37:03
-gem5 executing on zizzer
-command line: build/ARM/gem5.fast -d build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-timing -re tests/run.py build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-timing
+gem5 compiled Mar  9 2012 08:32:03
+gem5 started Mar  9 2012 08:33:32
+gem5 executing on u200540-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing -re tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing
+The currently selected ARM platforms doesn't support
+ the amount of DRAM you've selected. Please try
+ another platform
 Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 info: Using bootloader at address 0x80000000
 info: Entering event queue @ 0.  Starting simulation...
 Exiting @ tick 2591441692000 because m5_exit instruction encountered
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt
index 682f0b879..be18b1f6a 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  2.591442                       # Nu
 sim_ticks                                2591441692000                       # Number of ticks simulated
 final_tick                               2591441692000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 874833                       # Simulator instruction rate (inst/s)
-host_op_rate                                  1117723                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                            38375829651                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 376612                       # Number of bytes of host memory used
-host_seconds                                    67.53                       # Real time elapsed on the host
+host_inst_rate                                 652104                       # Simulator instruction rate (inst/s)
+host_op_rate                                   833155                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                            28605499848                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 382484                       # Number of bytes of host memory used
+host_seconds                                    90.59                       # Real time elapsed on the host
 sim_insts                                    59075683                       # Number of instructions simulated
 sim_ops                                      75477515                       # Number of ops (including micro ops) simulated
 system.realview.nvmem.bytes_read                   20                       # Number of bytes read from this memory
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/status b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/status
index 8953751c2..52e0ca5f6 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/status
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/status
@@ -1 +1 @@
-build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-timing FAILED!
+build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing passed.