Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

soc_core: remove 256MB mem_map limitation 

mem_map was limited to 8 256MB for simplicity but has become an issue for
complex SoCs. Default mem_map size is still 256MB (retro-compatibility) but
size can now be specified.
This commit is contained in:
Florent Kermarrec 2019-06-27 23:07:26 +02:00
parent b65968c329
commit 740629ba53
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
litex/soc/integration/soc_core.py
View File

@ -93,8 +93,9 @@ def get_mem_data(filename_or_regions, endianness="big", mem_size=None):
i += 1 i += 1
return data return data
def mem_decoder(address, start=26, end=29): def mem_decoder(address, size=0x10000000):
return lambda a: a[start:end] == ((address >> (start+2)) & (2**(end-start))-1) address &= ~0x80000000
return lambda a: (a[:-1] >= address//4) & (a[:-1] < (address + size)//4)
def csr_map_update(csr_map, csr_peripherals): def csr_map_update(csr_map, csr_peripherals):
csr_map.update(dict((n, v) csr_map.update(dict((n, v)
@ -397,9 +398,13 @@ class SoCCore(Module):
raise FinalizeError raise FinalizeError
self._wb_masters.append(wbm) self._wb_masters.append(wbm)
def add_wb_slave(self, address_decoder, interface): def add_wb_slave(self, address_or_address_decoder, interface, size=None):
if self.finalized: if self.finalized:
raise FinalizeError raise FinalizeError
if size is not None:
address_decoder = mem_decoder(address_or_address_decoder, size)
else:
address_decoder = address_or_address_decoder
self._wb_slaves.append((address_decoder, interface)) self._wb_slaves.append((address_decoder, interface))
def add_csr_master(self, csrm): def add_csr_master(self, csrm):