41a42
> import HMC
153a155,162
> if ( options.mem_type == "HMC_2500_x32"):
> HMC.config_hmc(options, system)
> subsystem = system.hmc
> xbar = system.hmc.xbar
> else:
> subsystem = system
> xbar = system.membus
>
164c173
< system.external_memory = m5.objects.ExternalSlave(
---
> subsystem.external_memory = m5.objects.ExternalSlave(
166c175
< port_data="init_mem0", port=system.membus.master,
---
> port_data="init_mem0", port=xbar.master,
168c177
< system.kernel_addr_check = False
---
> subsystem.kernel_addr_check = False
202c211
< system.mem_ctrls = mem_ctrls
---
> subsystem.mem_ctrls = mem_ctrls
205,206c214,215
< for i in xrange(len(system.mem_ctrls)):
< system.mem_ctrls[i].port = system.membus.master
---
> for i in xrange(len(subsystem.mem_ctrls)):
> subsystem.mem_ctrls[i].port = xbar.master