185c185
< def makeArmSystem(mem_mode, machine_type, mdesc = None,
---
> def makeArmSystem(mem_mode, machine_type, num_cpus = 1, mdesc = None,
212,213d211
< elif machine_type == "VExpress_ELT":
< self.realview = VExpress_ELT()
215a214,215
> if not dtb_filename:
> dtb_filename = 'vexpress.aarch32.ll_20131205.0-gem5.%dcpu.dtb' % num_cpus
217a218,222
> if os.path.split(mdesc.disk())[-1] == 'linux-aarch32-ael.img':
> print "Selected 64-bit ARM architecture, updating default disk image..."
> mdesc.diskname = 'linaro-minimal-aarch64.img'
> if not dtb_filename:
> dtb_filename = 'vexpress.aarch64.20140821.dtb'
256c261
< self.kernel = binary('vmlinux-3.16-aarch64-vexpress-emm64-pcie')
---
> self.kernel = binary('vmlinux.aarch64.20140821')
258c263
< self.kernel = binary('vmlinux-3.3-arm-vexpress-emm-pcie')
---
> self.kernel = binary('vmlinux.aarch32.ll_20131205.0-gem5')