15c15
< boot_loader=/dist/m5/system/binaries/boot_emm.arm
---
> boot_loader=/usr/local/google/home/gabeblack/gem5/dist/m5/system/binaries/boot_emm.arm
20c20
< dtb_filename=/dist/m5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb
---
> dtb_filename=/usr/local/google/home/gabeblack/gem5/dist/m5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb
33c33
< kernel=/dist/m5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
---
> kernel=/usr/local/google/home/gabeblack/gem5/dist/m5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
52c52
< readfile=/z/powerjg/gem5-upstream/tests/testing/../halt.sh
---
> readfile=/usr/local/google/home/gabeblack/gem5/gem5-public/tests/testing/../halt.sh
102c102
< image_file=/dist/m5/system/disks/linux-aarch32-ael.img
---
> image_file=/usr/local/google/home/gabeblack/gem5/dist/m5/system/disks/linux-aarch32-ael.img
146a147
> syscallRetryLatency=10000
317,318d317
< id_aa64pfr0_el1=34
< id_aa64pfr1_el1=0
329,330d327
< id_pfr0=49
< id_pfr1=4113
530a528
> syscallRetryLatency=10000
701,702d698
< id_aa64pfr0_el1=34
< id_aa64pfr1_el1=0
713,714d708
< id_pfr0=49
< id_pfr1=4113