1c1
< # Copyright (c) 2013 ARM Limited
---
> # Copyright (c) 2013, 2017 ARM Limited
155c155,166
< if ( options.mem_type == "HMC_2500_1x32"):
---
> # Mandatory options
> opt_mem_type = options.mem_type
> opt_mem_channels = options.mem_channels
>
> # Optional options
> opt_tlm_memory = getattr(options, "tlm_memory", None)
> opt_external_memory_system = getattr(options, "external_memory_system",
> None)
> opt_elastic_trace_en = getattr(options, "elastic_trace_en", False)
> opt_mem_ranks = getattr(options, "mem_ranks", None)
>
> if opt_mem_type == "HMC_2500_1x32":
164c175
< if options.tlm_memory:
---
> if opt_tlm_memory:
167c178
< port_data=options.tlm_memory,
---
> port_data=opt_tlm_memory,
173c184
< if options.external_memory_system:
---
> if opt_external_memory_system:
175c186
< port_type=options.external_memory_system,
---
> port_type=opt_external_memory_system,
181c192
< nbr_mem_ctrls = options.mem_channels
---
> nbr_mem_ctrls = opt_mem_channels
188c199
< cls = get(options.mem_type)
---
> cls = get(opt_mem_type)
191,192c202
< if options.elastic_trace_en and not issubclass(cls, \
< m5.objects.SimpleMemory):
---
> if opt_elastic_trace_en and not issubclass(cls, m5.objects.SimpleMemory):
211,213c221,222
< if issubclass(cls, m5.objects.DRAMCtrl) and \
< options.mem_ranks:
< mem_ctrl.ranks_per_channel = options.mem_ranks
---
> if issubclass(cls, m5.objects.DRAMCtrl) and opt_mem_ranks:
> mem_ctrl.ranks_per_channel = opt_mem_ranks
215c224
< if options.elastic_trace_en:
---
> if opt_elastic_trace_en:
226c235
< if (options.mem_type == "HMC_2500_1x32"):
---
> if opt_mem_type == "HMC_2500_1x32":