diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2012-01-28 07:24:01 -0800 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2012-01-28 07:24:01 -0800 |
commit | c3d41a2def15cdaf2ac3984315f452dacc6a0884 (patch) | |
tree | 5324ebec3add54b934a841eee901983ac3463a7f /tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini | |
parent | da2a4acc26ba264c3c4a12495776fd6a1c4fb133 (diff) | |
parent | 4acca8a0536d4445ed25b67edf571ae460446ab9 (diff) | |
download | gem5-c3d41a2def15cdaf2ac3984315f452dacc6a0884.tar.xz |
Merge with the main repo.
--HG--
rename : src/mem/vport.hh => src/mem/fs_translating_port_proxy.hh
rename : src/mem/translating_port.cc => src/mem/se_translating_port_proxy.cc
rename : src/mem/translating_port.hh => src/mem/se_translating_port_proxy.hh
Diffstat (limited to 'tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini')
-rw-r--r-- | tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini | 68 |
1 files changed, 33 insertions, 35 deletions
diff --git a/tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini b/tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini index e6a0de845..6f9417ef5 100644 --- a/tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini +++ b/tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini @@ -32,20 +32,18 @@ work_cpus_ckpt_count=0 work_end_ckpt_count=0 work_end_exit_count=0 work_item_id=-1 +system_port=system.membus.port[7] [system.bridge] type=Bridge delay=50000 -filter_ranges_a=0:18446744073709551615 -filter_ranges_b=0:268435455 nack_delay=4000 -req_size_a=16 -req_size_b=16 -resp_size_a=16 -resp_size_b=16 +ranges=268435456:520093695 1073741824:18446744073709551615 +req_size=16 +resp_size=16 write_ack=false -side_a=system.iobus.port[0] -side_b=system.membus.port[0] +master=system.iobus.port[0] +slave=system.membus.port[0] [system.cf0] type=IdeDisk @@ -987,7 +985,7 @@ clock=1000 header_cycles=1 use_default_range=false width=64 -port=system.bridge.side_a system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.dmac_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.smc_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.gpio0_fake.pio system.realview.gpio1_fake.pio system.realview.gpio2_fake.pio system.realview.ssp_fake.pio system.realview.sci_fake.pio system.realview.aaci_fake.pio system.realview.mmc_fake.pio system.realview.rtc_fake.pio system.realview.flash_fake.pio system.iocache.cpu_side system.realview.cf_ctrl.config system.realview.cf_ctrl.dma system.realview.clcd.dma +port=system.bridge.master system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.clcd.dma system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.cf_ctrl.config system.realview.cf_ctrl.dma system.realview.dmac_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.smc_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.gpio0_fake.pio system.realview.gpio1_fake.pio system.realview.gpio2_fake.pio system.realview.ssp_fake.pio system.realview.sci_fake.pio system.realview.aaci_fake.pio system.realview.mmc_fake.pio system.realview.rtc_fake.pio system.realview.flash_fake.pio system.iocache.cpu_side [system.iocache] type=BaseCache @@ -1018,8 +1016,8 @@ tgts_per_mshr=12 trace_addr=0 two_queue=false write_buffers=8 -cpu_side=system.iobus.port[25] -mem_side=system.membus.port[7] +cpu_side=system.iobus.port[28] +mem_side=system.membus.port[8] [system.l2c] type=BaseCache @@ -1051,7 +1049,7 @@ trace_addr=0 two_queue=false write_buffers=8 cpu_side=system.toL2Bus.port[0] -mem_side=system.membus.port[8] +mem_side=system.membus.port[9] [system.membus] type=Bus @@ -1063,7 +1061,7 @@ header_cycles=1 use_default_range=false width=64 default=system.membus.badaddr_responder.pio -port=system.bridge.side_b system.nvmem.port[0] system.physmem.port[0] system.realview.gic.pio system.realview.l2x0_fake.pio system.realview.a9scu.pio system.realview.local_cpu_timer.pio system.iocache.mem_side system.l2c.mem_side +port=system.bridge.slave system.nvmem.port[0] system.physmem.port[0] system.realview.gic.pio system.realview.l2x0_fake.pio system.realview.a9scu.pio system.realview.local_cpu_timer.pio system.system_port system.iocache.mem_side system.l2c.mem_side [system.membus.badaddr_responder] type=IsaFake @@ -1125,7 +1123,7 @@ pio_addr=268451840 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[21] +pio=system.iobus.port[24] [system.realview.cf_ctrl] type=IdeController @@ -1179,9 +1177,9 @@ pci_func=0 pio_latency=1000 platform=system.realview system=system -config=system.iobus.port[26] -dma=system.iobus.port[27] -pio=system.iobus.port[8] +config=system.iobus.port[10] +dma=system.iobus.port[11] +pio=system.iobus.port[9] [system.realview.clcd] type=Pl111 @@ -1196,7 +1194,7 @@ pio_latency=10000 platform=system.realview system=system vnc=system.vncserver -dma=system.iobus.port[28] +dma=system.iobus.port[6] pio=system.iobus.port[5] [system.realview.dmac_fake] @@ -1207,7 +1205,7 @@ pio_addr=268632064 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[9] +pio=system.iobus.port[12] [system.realview.flash_fake] type=IsaFake @@ -1224,7 +1222,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.port[24] +pio=system.iobus.port[27] [system.realview.gic] type=Gic @@ -1246,7 +1244,7 @@ pio_addr=268513280 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[16] +pio=system.iobus.port[19] [system.realview.gpio1_fake] type=AmbaFake @@ -1256,7 +1254,7 @@ pio_addr=268517376 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[17] +pio=system.iobus.port[20] [system.realview.gpio2_fake] type=AmbaFake @@ -1266,7 +1264,7 @@ pio_addr=268521472 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[18] +pio=system.iobus.port[21] [system.realview.kmi0] type=Pl050 @@ -1280,7 +1278,7 @@ pio_latency=1000 platform=system.realview system=system vnc=system.vncserver -pio=system.iobus.port[6] +pio=system.iobus.port[7] [system.realview.kmi1] type=Pl050 @@ -1294,7 +1292,7 @@ pio_latency=1000 platform=system.realview system=system vnc=system.vncserver -pio=system.iobus.port[7] +pio=system.iobus.port[8] [system.realview.l2x0_fake] type=IsaFake @@ -1333,7 +1331,7 @@ pio_addr=268455936 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[22] +pio=system.iobus.port[25] [system.realview.realview_io] type=RealViewCtrl @@ -1354,7 +1352,7 @@ pio_addr=268529664 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[23] +pio=system.iobus.port[26] [system.realview.sci_fake] type=AmbaFake @@ -1364,7 +1362,7 @@ pio_addr=268492800 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[20] +pio=system.iobus.port[23] [system.realview.smc_fake] type=AmbaFake @@ -1374,7 +1372,7 @@ pio_addr=269357056 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[13] +pio=system.iobus.port[16] [system.realview.sp810_fake] type=AmbaFake @@ -1384,7 +1382,7 @@ pio_addr=268439552 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[14] +pio=system.iobus.port[17] [system.realview.ssp_fake] type=AmbaFake @@ -1394,7 +1392,7 @@ pio_addr=268488704 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[19] +pio=system.iobus.port[22] [system.realview.timer0] type=Sp804 @@ -1445,7 +1443,7 @@ pio_addr=268476416 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[10] +pio=system.iobus.port[13] [system.realview.uart2_fake] type=AmbaFake @@ -1455,7 +1453,7 @@ pio_addr=268480512 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[11] +pio=system.iobus.port[14] [system.realview.uart3_fake] type=AmbaFake @@ -1465,7 +1463,7 @@ pio_addr=268484608 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[12] +pio=system.iobus.port[15] [system.realview.watchdog_fake] type=AmbaFake @@ -1475,7 +1473,7 @@ pio_addr=268500992 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[15] +pio=system.iobus.port[18] [system.terminal] type=Terminal |