156,158c156,159
< HMC.config_hmc(options, system)
< subsystem = system.hmc
< xbar = system.hmc.xbar
---
> HMChost = HMC.config_host_hmc(options, system)
> HMC.config_hmc(options, system, HMChost.hmc_host)
> subsystem = system.hmc_dev
> xbar = system.hmc_dev.xbar
225c226,229
< subsystem.mem_ctrls[i].port = xbar.master
---
> if (options.mem_type == "HMC_2500_x32"):
> subsystem.mem_ctrls[i].port = xbar[i/4].master
> else:
> subsystem.mem_ctrls[i].port = xbar.master