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

soc: use io_regions for alloc_region

This commit is contained in:
Florent Kermarrec 2020-02-10 18:19:35 +01:00
parent 9ac09ddde5
commit d320be8ecb
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
litex/soc/integration/soc.py
View File

@ -198,7 +198,7 @@ class SoCBusHandler(Module):
# If no origin specified, allocate region. # If no origin specified, allocate region.
if region.origin is None: if region.origin is None:
allocated = True allocated = True
region = self.alloc_region(region.size, region.cached) region = self.alloc_region(name, region.size, region.cached)
self.regions[name] = region self.regions[name] = region
# Else add region and check for overlaps. # Else add region and check for overlaps.
else: else:
@ -227,18 +227,14 @@ class SoCBusHandler(Module):
self.logger.error("{} is not a supported Region".format(colorer(name, color="red"))) self.logger.error("{} is not a supported Region".format(colorer(name, color="red")))
raise raise
def alloc_region(self, size, cached=True): def alloc_region(self, name, size, cached=True):
self.logger.info("Allocating {} Region of size {}...".format( self.logger.info("Allocating {} Region of size {}...".format(
colorer("Cached" if cached else "IO"), colorer("Cached" if cached else "IO"),
colorer("0x{:08x}".format(size)))) colorer("0x{:08x}".format(size))))
# Limit Search Regions # Limit Search Regions
uncached_regions = {}
for _, region in self.regions.items():
if region.cached == False:
uncached_regions[name] = region
if cached == False: if cached == False:
search_regions = uncached_regions search_regions = self.io_regions
else: else:
search_regions = {"main": SoCRegion(origin=0x00000000, size=2**self.address_width-1)} search_regions = {"main": SoCRegion(origin=0x00000000, size=2**self.address_width-1)}