46c46
< readfile=/work/gem5/outgoing/gem5/tests/halt.sh
---
> readfile=/work/gem5/outgoing/gem5_2/tests/halt.sh
848c848
< use_default_range=true
---
> use_default_range=false
850,851c850
< default=system.realview.pciconfig.pio
< master=system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.hdlcd.pio system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.cf_ctrl.config system.realview.rtc.pio system.realview.vram.port system.realview.l2x0_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.aaci_fake.pio system.realview.lan_fake.pio system.realview.usb_fake.pio system.realview.mmc_fake.pio system.realview.energy_ctrl.pio system.realview.ide.pio system.realview.ide.config system.realview.ethernet.pio system.realview.ethernet.config system.iocache.cpu_side
---
> master=system.realview.uart.pio system.realview.realview_io.pio system.realview.pci_host.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.hdlcd.pio system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.rtc.pio system.realview.vram.port system.realview.l2x0_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.aaci_fake.pio system.realview.lan_fake.pio system.realview.usb_fake.pio system.realview.mmc_fake.pio system.realview.energy_ctrl.pio system.realview.ide.pio system.realview.ethernet.pio system.iocache.cpu_side
878c877
< cpu_side=system.iobus.master[27]
---
> cpu_side=system.iobus.master[25]
1005c1004
< children=aaci_fake cf_ctrl clcd dcc energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mcc mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
---
> children=aaci_fake cf_ctrl clcd dcc energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mcc mmc_fake nvmem pci_host realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
1008,1010d1006
< pci_cfg_base=805306368
< pci_cfg_gen_offsets=true
< pci_io_base=788529152
1102a1099
> host=system.realview.pci_host
1108d1104
< platform=system.realview
1110d1105
< config=system.iobus.master[9]
1112c1107
< pio=system.iobus.master[8]
---
> pio=system.iobus.master[9]
1128c1123
< pio=system.iobus.master[4]
---
> pio=system.iobus.master[5]
1290a1286
> host=system.realview.pci_host
1297d1292
< platform=system.realview
1307d1301
< config=system.iobus.master[26]
1309c1303
< pio=system.iobus.master[25]
---
> pio=system.iobus.master[24]
1351c1345
< pio=system.iobus.master[5]
---
> pio=system.iobus.master[6]
1431a1426
> host=system.realview.pci_host
1437d1431
< platform=system.realview
1439d1432
< config=system.iobus.master[24]
1456c1449
< pio=system.iobus.master[6]
---
> pio=system.iobus.master[7]
1471c1464
< pio=system.iobus.master[7]
---
> pio=system.iobus.master[8]
1594,1596c1587,1588
< [system.realview.pciconfig]
< type=PciConfigAll
< bus=0
---
> [system.realview.pci_host]
> type=GenericPciHost
1597a1590,1592
> conf_base=805306368
> conf_device_bits=12
> conf_size=268435456
1599,1600c1594,1596
< pio_addr=0
< pio_latency=30000
---
> pci_dma_base=0
> pci_mem_base=0
> pci_pio_base=788529152
1602d1597
< size=268435456
1604c1599
< pio=system.iobus.default
---
> pio=system.iobus.master[2]
1656c1651
< pio=system.iobus.master[2]
---
> pio=system.iobus.master[3]
1671c1666
< pio=system.iobus.master[3]
---
> pio=system.iobus.master[4]