tests: Update regressions for the new kernels and various preceeding fixes.

1 files changed, 360 insertions, 174 deletions

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 2198282f2..e4e3f0a2b 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
@@ -11,18 +11,18 @@ time_sync_spin_threshold=100000000
 [system]
 type=LinuxArmSystem
 children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain
-atags_addr=256
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot.arm
-boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1
+atags_addr=134217728
+boot_loader=/dist/binaries/boot_emm.arm
+boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
 boot_release_addr=65528
 cache_line_size=64
 clk_domain=system.clk_domain
-dtb_filename=
+dtb_filename=/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb
 early_kernel_symbols=false
 enable_context_switch_stats_dump=false
 eventq_index=0
-flags_addr=268435504
-gic_cpu_addr=520093952
+flags_addr=469827632
+gic_cpu_addr=738205696
 have_generic_timer=false
 have_large_asid_64=false
 have_lpae=false
@@ -30,20 +30,20 @@ have_security=false
 have_virtualization=false
 highest_el_is_64=false
 init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+kernel=/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
 kernel_addr_check=true
 load_addr_mask=268435455
-load_offset=0
-machine_type=RealView_PBX
+load_offset=2147483648
+machine_type=VExpress_EMM
 mem_mode=atomic
-mem_ranges=0:134217727
-memories=system.realview.nvmem system.physmem
+mem_ranges=2147483648:2415919103
+memories=system.realview.nvmem system.physmem system.realview.vram
 multi_proc=true
 num_work_ids=16
 panic_on_oops=true
 panic_on_panic=true
 phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5.latest/tests/halt.sh
 reset_addr_64=0
 symbolfile=
 work_begin_ckpt_count=0
@@ -53,14 +53,14 @@ work_cpus_ckpt_count=0
 work_end_ckpt_count=0
 work_end_exit_count=0
 work_item_id=-1
-system_port=system.membus.slave[0]
+system_port=system.membus.slave[1]
 
 [system.bridge]
 type=Bridge
 clk_domain=system.clk_domain
 delay=50000
 eventq_index=0
-ranges=268435456:520093695 1073741824:1610612735
+ranges=788529152:805306367 721420288:725614591 805306368:1073741823 1073741824:1610612735 402653184:469762047 469762048:536870911
 req_size=16
 resp_size=16
 master=system.iobus.slave[0]
@@ -86,7 +86,7 @@ table_size=65536
 [system.cf0.image.child]
 type=RawDiskImage
 eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-arm-ael.img
+image_file=/dist/disks/linux-aarch32-ael.img
 read_only=true
 
 [system.clk_domain]
@@ -278,6 +278,7 @@ id_mmfr3=34611729
 id_pfr0=49
 id_pfr1=4113
 midr=1091551472
+pmu=Null
 system=system
 
 [system.cpu0.istage2_mmu]
@@ -570,6 +571,7 @@ id_mmfr3=34611729
 id_pfr0=49
 id_pfr1=4113
 midr=1091551472
+pmu=Null
 system=system
 
 [system.cpu1.istage2_mmu]
@@ -707,15 +709,16 @@ type=NoncoherentXBar
 clk_domain=system.clk_domain
 eventq_index=0
 header_cycles=1
-use_default_range=false
+use_default_range=true
 width=8
-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.pio system.realview.flash_fake.pio system.realview.energy_ctrl.pio system.iocache.cpu_side
-slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma
+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
+slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma system.realview.ide.dma system.realview.ethernet.dma
 
 [system.iocache]
 type=BaseCache
 children=tags
-addr_ranges=0:134217727
+addr_ranges=2147483648:2415919103
 assoc=8
 clk_domain=system.clk_domain
 eventq_index=0
@@ -734,8 +737,8 @@ tags=system.iocache.tags
 tgts_per_mshr=12
 two_queue=false
 write_buffers=8
-cpu_side=system.iobus.master[26]
-mem_side=system.membus.slave[2]
+cpu_side=system.iobus.master[27]
+mem_side=system.membus.slave[3]
 
 [system.iocache.tags]
 type=LRU
@@ -770,7 +773,7 @@ tgts_per_mshr=12
 two_queue=false
 write_buffers=8
 cpu_side=system.toL2Bus.master[0]
-mem_side=system.membus.slave[1]
+mem_side=system.membus.slave[2]
 
 [system.l2c.tags]
 type=LRU
@@ -793,8 +796,8 @@ system=system
 use_default_range=false
 width=8
 default=system.membus.badaddr_responder.pio
-master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.l2x0_fake.pio system.realview.a9scu.pio system.realview.local_cpu_timer.pio system.physmem.port
-slave=system.system_port system.l2c.mem_side system.iocache.mem_side
+master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.local_cpu_timer.pio system.realview.vgic.pio system.physmem.port
+slave=system.realview.hdlcd.dma system.system_port system.l2c.mem_side system.iocache.mem_side
 
 [system.membus.badaddr_responder]
 type=IsaFake
@@ -824,47 +827,38 @@ in_addr_map=true
 latency=30000
 latency_var=0
 null=false
-range=0:134217727
-port=system.membus.master[6]
+range=2147483648:2415919103
+port=system.membus.master[5]
 
 [system.realview]
 type=RealView
-children=a9scu aaci_fake cf_ctrl clcd dmac_fake energy_ctrl flash_fake gic gpio0_fake gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake local_cpu_timer mmc_fake nvmem realview_io rtc sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake watchdog_fake
+children=aaci_fake cf_ctrl clcd energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
 eventq_index=0
 intrctrl=system.intrctrl
-pci_cfg_base=0
+pci_cfg_base=805306368
 pci_cfg_gen_offsets=false
 pci_io_base=0
 system=system
 
-[system.realview.a9scu]
-type=A9SCU
-clk_domain=system.clk_domain
-eventq_index=0
-pio_addr=520093696
-pio_latency=100000
-system=system
-pio=system.membus.master[4]
-
 [system.realview.aaci_fake]
 type=AmbaFake
 amba_id=0
 clk_domain=system.clk_domain
 eventq_index=0
 ignore_access=false
-pio_addr=268451840
+pio_addr=470024192
 pio_latency=100000
 system=system
-pio=system.iobus.master[21]
+pio=system.iobus.master[18]
 
 [system.realview.cf_ctrl]
 type=IdeController
-BAR0=402653184
+BAR0=471465984
 BAR0LegacyIO=true
-BAR0Size=16
-BAR1=402653440
+BAR0Size=256
+BAR1=471466240
 BAR1LegacyIO=true
-BAR1Size=1
+BAR1Size=4096
 BAR2=1
 BAR2LegacyIO=false
 BAR2Size=8
@@ -934,18 +928,18 @@ VendorID=32902
 clk_domain=system.clk_domain
 config_latency=20000
 ctrl_offset=2
-disks=system.cf0
+disks=
 eventq_index=0
-io_shift=1
+io_shift=2
 pci_bus=2
-pci_dev=7
+pci_dev=0
 pci_func=0
 pio_latency=30000
 platform=system.realview
 system=system
-config=system.iobus.master[8]
+config=system.iobus.master[9]
 dma=system.iobus.slave[2]
-pio=system.iobus.master[7]
+pio=system.iobus.master[8]
 
 [system.realview.clcd]
 type=Pl111
@@ -954,8 +948,8 @@ clk_domain=system.clk_domain
 enable_capture=true
 eventq_index=0
 gic=system.realview.gic
-int_num=55
-pio_addr=268566528
+int_num=46
+pio_addr=471793664
 pio_latency=10000
 pixel_clock=41667
 system=system
@@ -963,51 +957,129 @@ vnc=system.vncserver
 dma=system.iobus.slave[1]
 pio=system.iobus.master[4]
 
-[system.realview.dmac_fake]
-type=AmbaFake
-amba_id=0
+[system.realview.energy_ctrl]
+type=EnergyCtrl
 clk_domain=system.clk_domain
+dvfs_handler=system.dvfs_handler
 eventq_index=0
-ignore_access=false
-pio_addr=268632064
+pio_addr=470286336
 pio_latency=100000
 system=system
-pio=system.iobus.master[9]
+pio=system.iobus.master[22]
 
-[system.realview.energy_ctrl]
-type=EnergyCtrl
+[system.realview.ethernet]
+type=IGbE
+BAR0=0
+BAR0LegacyIO=false
+BAR0Size=131072
+BAR1=0
+BAR1LegacyIO=false
+BAR1Size=0
+BAR2=0
+BAR2LegacyIO=false
+BAR2Size=0
+BAR3=0
+BAR3LegacyIO=false
+BAR3Size=0
+BAR4=0
+BAR4LegacyIO=false
+BAR4Size=0
+BAR5=0
+BAR5LegacyIO=false
+BAR5Size=0
+BIST=0
+CacheLineSize=0
+CapabilityPtr=0
+CardbusCIS=0
+ClassCode=2
+Command=0
+DeviceID=4213
+ExpansionROM=0
+HeaderType=0
+InterruptLine=1
+InterruptPin=1
+LatencyTimer=0
+LegacyIOBase=0
+MSICAPBaseOffset=0
+MSICAPCapId=0
+MSICAPMaskBits=0
+MSICAPMsgAddr=0
+MSICAPMsgCtrl=0
+MSICAPMsgData=0
+MSICAPMsgUpperAddr=0
+MSICAPNextCapability=0
+MSICAPPendingBits=0
+MSIXCAPBaseOffset=0
+MSIXCAPCapId=0
+MSIXCAPNextCapability=0
+MSIXMsgCtrl=0
+MSIXPbaOffset=0
+MSIXTableOffset=0
+MaximumLatency=0
+MinimumGrant=255
+PMCAPBaseOffset=0
+PMCAPCapId=0
+PMCAPCapabilities=0
+PMCAPCtrlStatus=0
+PMCAPNextCapability=0
+PXCAPBaseOffset=0
+PXCAPCapId=0
+PXCAPCapabilities=0
+PXCAPDevCap2=0
+PXCAPDevCapabilities=0
+PXCAPDevCtrl=0
+PXCAPDevCtrl2=0
+PXCAPDevStatus=0
+PXCAPLinkCap=0
+PXCAPLinkCtrl=0
+PXCAPLinkStatus=0
+PXCAPNextCapability=0
+ProgIF=0
+Revision=0
+Status=0
+SubClassCode=0
+SubsystemID=4104
+SubsystemVendorID=32902
+VendorID=32902
 clk_domain=system.clk_domain
-dvfs_handler=system.dvfs_handler
+config_latency=20000
 eventq_index=0
-pio_addr=268496896
-pio_latency=100000
+fetch_comp_delay=10000
+fetch_delay=10000
+hardware_address=00:90:00:00:00:01
+pci_bus=0
+pci_dev=0
+pci_func=0
+phy_epid=896
+phy_pid=680
+pio_latency=30000
+platform=system.realview
+rx_desc_cache_size=64
+rx_fifo_size=393216
+rx_write_delay=0
 system=system
+tx_desc_cache_size=64
+tx_fifo_size=393216
+tx_read_delay=0
+wb_comp_delay=10000
+wb_delay=10000
+config=system.iobus.master[26]
+dma=system.iobus.slave[4]
 pio=system.iobus.master[25]
 
-[system.realview.flash_fake]
-type=IsaFake
-clk_domain=system.clk_domain
+[system.realview.generic_timer]
+type=GenericTimer
 eventq_index=0
-fake_mem=true
-pio_addr=1073741824
-pio_latency=100000
-pio_size=536870912
-ret_bad_addr=false
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-ret_data8=255
+gic=system.realview.gic
+int_num=29
 system=system
-update_data=false
-warn_access=
-pio=system.iobus.master[24]
 
 [system.realview.gic]
 type=Pl390
 clk_domain=system.clk_domain
-cpu_addr=520093952
+cpu_addr=738205696
 cpu_pio_delay=10000
-dist_addr=520097792
+dist_addr=738201600
 dist_pio_delay=10000
 eventq_index=0
 int_latency=10000
@@ -1017,38 +1089,111 @@ platform=system.realview
 system=system
 pio=system.membus.master[2]
 
-[system.realview.gpio0_fake]
-type=AmbaFake
-amba_id=0
-clk_domain=system.clk_domain
-eventq_index=0
-ignore_access=false
-pio_addr=268513280
-pio_latency=100000
-system=system
-pio=system.iobus.master[16]
-
-[system.realview.gpio1_fake]
-type=AmbaFake
-amba_id=0
+[system.realview.hdlcd]
+type=HDLcd
+amba_id=1314816
 clk_domain=system.clk_domain
+enable_capture=true
 eventq_index=0
-ignore_access=false
-pio_addr=268517376
-pio_latency=100000
+gic=system.realview.gic
+int_num=117
+pio_addr=721420288
+pio_latency=10000
+pixel_clock=7299
 system=system
-pio=system.iobus.master[17]
+vnc=system.vncserver
+dma=system.membus.slave[0]
+pio=system.iobus.master[5]
 
-[system.realview.gpio2_fake]
-type=AmbaFake
-amba_id=0
+[system.realview.ide]
+type=IdeController
+BAR0=1
+BAR0LegacyIO=false
+BAR0Size=8
+BAR1=1
+BAR1LegacyIO=false
+BAR1Size=4
+BAR2=1
+BAR2LegacyIO=false
+BAR2Size=8
+BAR3=1
+BAR3LegacyIO=false
+BAR3Size=4
+BAR4=1
+BAR4LegacyIO=false
+BAR4Size=16
+BAR5=1
+BAR5LegacyIO=false
+BAR5Size=0
+BIST=0
+CacheLineSize=0
+CapabilityPtr=0
+CardbusCIS=0
+ClassCode=1
+Command=0
+DeviceID=28945
+ExpansionROM=0
+HeaderType=0
+InterruptLine=2
+InterruptPin=2
+LatencyTimer=0
+LegacyIOBase=0
+MSICAPBaseOffset=0
+MSICAPCapId=0
+MSICAPMaskBits=0
+MSICAPMsgAddr=0
+MSICAPMsgCtrl=0
+MSICAPMsgData=0
+MSICAPMsgUpperAddr=0
+MSICAPNextCapability=0
+MSICAPPendingBits=0
+MSIXCAPBaseOffset=0
+MSIXCAPCapId=0
+MSIXCAPNextCapability=0
+MSIXMsgCtrl=0
+MSIXPbaOffset=0
+MSIXTableOffset=0
+MaximumLatency=0
+MinimumGrant=0
+PMCAPBaseOffset=0
+PMCAPCapId=0
+PMCAPCapabilities=0
+PMCAPCtrlStatus=0
+PMCAPNextCapability=0
+PXCAPBaseOffset=0
+PXCAPCapId=0
+PXCAPCapabilities=0
+PXCAPDevCap2=0
+PXCAPDevCapabilities=0
+PXCAPDevCtrl=0
+PXCAPDevCtrl2=0
+PXCAPDevStatus=0
+PXCAPLinkCap=0
+PXCAPLinkCtrl=0
+PXCAPLinkStatus=0
+PXCAPNextCapability=0
+ProgIF=133
+Revision=0
+Status=640
+SubClassCode=1
+SubsystemID=0
+SubsystemVendorID=0
+VendorID=32902
 clk_domain=system.clk_domain
+config_latency=20000
+ctrl_offset=0
+disks=system.cf0
 eventq_index=0
-ignore_access=false
-pio_addr=268521472
-pio_latency=100000
+io_shift=0
+pci_bus=0
+pci_dev=1
+pci_func=0
+pio_latency=30000
+platform=system.realview
 system=system
-pio=system.iobus.master[18]
+config=system.iobus.master[24]
+dma=system.iobus.slave[3]
+pio=system.iobus.master[23]
 
 [system.realview.kmi0]
 type=Pl050
@@ -1057,13 +1202,13 @@ clk_domain=system.clk_domain
 eventq_index=0
 gic=system.realview.gic
 int_delay=1000000
-int_num=52
+int_num=44
 is_mouse=false
-pio_addr=268460032
+pio_addr=470155264
 pio_latency=100000
 system=system
 vnc=system.vncserver
-pio=system.iobus.master[5]
+pio=system.iobus.master[6]
 
 [system.realview.kmi1]
 type=Pl050
@@ -1072,20 +1217,20 @@ clk_domain=system.clk_domain
 eventq_index=0
 gic=system.realview.gic
 int_delay=1000000
-int_num=53
+int_num=45
 is_mouse=true
-pio_addr=268464128
+pio_addr=470220800
 pio_latency=100000
 system=system
 vnc=system.vncserver
-pio=system.iobus.master[6]
+pio=system.iobus.master[7]
 
 [system.realview.l2x0_fake]
 type=IsaFake
 clk_domain=system.clk_domain
 eventq_index=0
 fake_mem=false
-pio_addr=520101888
+pio_addr=739246080
 pio_latency=100000
 pio_size=4095
 ret_bad_addr=false
@@ -1096,7 +1241,25 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.membus.master[3]
+pio=system.iobus.master[12]
+
+[system.realview.lan_fake]
+type=IsaFake
+clk_domain=system.clk_domain
+eventq_index=0
+fake_mem=false
+pio_addr=436207616
+pio_latency=100000
+pio_size=65535
+ret_bad_addr=false
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
+ret_data8=255
+system=system
+update_data=false
+warn_access=
+pio=system.iobus.master[19]
 
 [system.realview.local_cpu_timer]
 type=CpuLocalTimer
@@ -1105,10 +1268,10 @@ eventq_index=0
 gic=system.realview.gic
 int_num_timer=29
 int_num_watchdog=30
-pio_addr=520095232
+pio_addr=738721792
 pio_latency=100000
 system=system
-pio=system.membus.master[5]
+pio=system.membus.master[3]
 
 [system.realview.mmc_fake]
 type=AmbaFake
@@ -1116,10 +1279,10 @@ amba_id=0
 clk_domain=system.clk_domain
 eventq_index=0
 ignore_access=false
-pio_addr=268455936
+pio_addr=470089728
 pio_latency=100000
 system=system
-pio=system.iobus.master[22]
+pio=system.iobus.master[21]
 
 [system.realview.nvmem]
 type=SimpleMemory
@@ -1131,18 +1294,30 @@ in_addr_map=true
 latency=30000
 latency_var=0
 null=false
-range=2147483648:2214592511
+range=0:67108863
 port=system.membus.master[1]
 
+[system.realview.pciconfig]
+type=PciConfigAll
+bus=0
+clk_domain=system.clk_domain
+eventq_index=0
+pio_addr=0
+pio_latency=30000
+platform=system.realview
+size=268435456
+system=system
+pio=system.iobus.default
+
 [system.realview.realview_io]
 type=RealViewCtrl
 clk_domain=system.clk_domain
 eventq_index=0
-idreg=0
-pio_addr=268435456
+idreg=35979264
+pio_addr=469827584
 pio_latency=100000
-proc_id0=201326592
-proc_id1=201327138
+proc_id0=335544320
+proc_id1=335544320
 system=system
 pio=system.iobus.master[1]
 
@@ -1153,34 +1328,12 @@ clk_domain=system.clk_domain
 eventq_index=0
 gic=system.realview.gic
 int_delay=100000
-int_num=42
-pio_addr=268529664
+int_num=36
+pio_addr=471269376
 pio_latency=100000
 system=system
 time=Thu Jan  1 00:00:00 2009
-pio=system.iobus.master[23]
-
-[system.realview.sci_fake]
-type=AmbaFake
-amba_id=0
-clk_domain=system.clk_domain
-eventq_index=0
-ignore_access=false
-pio_addr=268492800
-pio_latency=100000
-system=system
-pio=system.iobus.master[20]
-
-[system.realview.smc_fake]
-type=AmbaFake
-amba_id=0
-clk_domain=system.clk_domain
-eventq_index=0
-ignore_access=false
-pio_addr=269357056
-pio_latency=100000
-system=system
-pio=system.iobus.master[13]
+pio=system.iobus.master[10]
 
 [system.realview.sp810_fake]
 type=AmbaFake
@@ -1188,21 +1341,10 @@ amba_id=0
 clk_domain=system.clk_domain
 eventq_index=0
 ignore_access=true
-pio_addr=268439552
-pio_latency=100000
-system=system
-pio=system.iobus.master[14]
-
-[system.realview.ssp_fake]
-type=AmbaFake
-amba_id=0
-clk_domain=system.clk_domain
-eventq_index=0
-ignore_access=false
-pio_addr=268488704
+pio_addr=469893120
 pio_latency=100000
 system=system
-pio=system.iobus.master[19]
+pio=system.iobus.master[16]
 
 [system.realview.timer0]
 type=Sp804
@@ -1212,9 +1354,9 @@ clock0=1000000
 clock1=1000000
 eventq_index=0
 gic=system.realview.gic
-int_num0=36
-int_num1=36
-pio_addr=268505088
+int_num0=34
+int_num1=34
+pio_addr=470876160
 pio_latency=100000
 system=system
 pio=system.iobus.master[2]
@@ -1227,9 +1369,9 @@ clock0=1000000
 clock1=1000000
 eventq_index=0
 gic=system.realview.gic
-int_num0=37
-int_num1=37
-pio_addr=268509184
+int_num0=35
+int_num1=35
+pio_addr=470941696
 pio_latency=100000
 system=system
 pio=system.iobus.master[3]
@@ -1241,8 +1383,8 @@ end_on_eot=false
 eventq_index=0
 gic=system.realview.gic
 int_delay=100000
-int_num=44
-pio_addr=268472320
+int_num=37
+pio_addr=470351872
 pio_latency=100000
 platform=system.realview
 system=system
@@ -1255,10 +1397,10 @@ amba_id=0
 clk_domain=system.clk_domain
 eventq_index=0
 ignore_access=false
-pio_addr=268476416
+pio_addr=470417408
 pio_latency=100000
 system=system
-pio=system.iobus.master[10]
+pio=system.iobus.master[13]
 
 [system.realview.uart2_fake]
 type=AmbaFake
@@ -1266,10 +1408,10 @@ amba_id=0
 clk_domain=system.clk_domain
 eventq_index=0
 ignore_access=false
-pio_addr=268480512
+pio_addr=470482944
 pio_latency=100000
 system=system
-pio=system.iobus.master[11]
+pio=system.iobus.master[14]
 
 [system.realview.uart3_fake]
 type=AmbaFake
@@ -1277,10 +1419,54 @@ amba_id=0
 clk_domain=system.clk_domain
 eventq_index=0
 ignore_access=false
-pio_addr=268484608
+pio_addr=470548480
 pio_latency=100000
 system=system
-pio=system.iobus.master[12]
+pio=system.iobus.master[15]
+
+[system.realview.usb_fake]
+type=IsaFake
+clk_domain=system.clk_domain
+eventq_index=0
+fake_mem=false
+pio_addr=452984832
+pio_latency=100000
+pio_size=131071
+ret_bad_addr=false
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
+ret_data8=255
+system=system
+update_data=false
+warn_access=
+pio=system.iobus.master[20]
+
+[system.realview.vgic]
+type=VGic
+clk_domain=system.clk_domain
+eventq_index=0
+gic=system.realview.gic
+hv_addr=738213888
+pio_delay=10000
+platform=system.realview
+ppint=25
+system=system
+vcpu_addr=738222080
+pio=system.membus.master[4]
+
+[system.realview.vram]
+type=SimpleMemory
+bandwidth=73.000000
+clk_domain=system.clk_domain
+conf_table_reported=false
+eventq_index=0
+in_addr_map=true
+latency=30000
+latency_var=0
+null=false
+range=402653184:436207615
+port=system.iobus.master[11]
 
 [system.realview.watchdog_fake]
 type=AmbaFake
@@ -1288,10 +1474,10 @@ amba_id=0
 clk_domain=system.clk_domain
 eventq_index=0
 ignore_access=false
-pio_addr=268500992
+pio_addr=470745088
 pio_latency=100000
 system=system
-pio=system.iobus.master[15]
+pio=system.iobus.master[17]
 
 [system.terminal]
 type=Terminal