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

Merge pull request #1890 from rtucker85/fix_csr_merge 

Fixes for errors when attempting import of Sub-SoCs .json
This commit is contained in:
enjoy-digital 2024-02-16 18:27:39 +01:00 committed by GitHub
parent cfbe3b028a 6c8633b9a3
commit 677443cef7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
litex/soc/integration/builder.py
View File

@ -138,8 +138,8 @@ class Builder:
def add_software_library(self, name): def add_software_library(self, name):
self.software_libraries.append(name) self.software_libraries.append(name)
def add_json(self, filename, name="", origin=0): def add_json(self, filename, origin=0, name=""):
self.jsons.append((filename, name, origin)) self.jsons.append((filename, origin, name))
def _get_json_mem_regions(self): def _get_json_mem_regions(self):
mem_regions = {} mem_regions = {}

2
litex/soc/integration/export.py
View File

@ -129,7 +129,7 @@ def get_linker_output_format(cpu):
def get_linker_regions(regions): def get_linker_regions(regions):
r = "MEMORY {\n" r = "MEMORY {\n"
for name, region in regions.items(): for name, region in regions.items():
r += f"\t{name} : ORIGIN = 0x{region.origin:08x}, LENGTH = 0x{region.length:08x}\n" r += f"\t{name} : ORIGIN = 0x{region.origin:08x}, LENGTH = 0x{region.size:08x}\n"
r += "}\n" r += "}\n"
return r return r