1c1
< # Copyright (c) 2012, 2017 ARM Limited
---
> # Copyright (c) 2012, 2017-2018 ARM Limited
138c138,139
< def create_system(options, full_system, system, piobus = None, dma_ports = []):
---
> def create_system(options, full_system, system, piobus = None, dma_ports = [],
> bootmem=None):
153c154
< ruby)"
---
> bootmem, ruby)"
201c202,203
< def create_directories(options, mem_ranges, ruby_system):
---
> def create_directories(options, mem_ranges, bootmem, ruby_system,
> system):
230d231
< return dir_cntrl_nodes
231a233,243
> if bootmem is not None:
> rom_dir_cntrl = Directory_Controller()
> rom_dir_cntrl.directory = RubyDirectoryMemory()
> rom_dir_cntrl.ruby_system = ruby_system
> rom_dir_cntrl.version = i + 1
> rom_dir_cntrl.memory = bootmem.port
> rom_dir_cntrl.addr_ranges = bootmem.range
> return (dir_cntrl_nodes, rom_dir_cntrl)
>
> return (dir_cntrl_nodes, None)
>