Merge pull request #1890 from rtucker85/fix_csr_merge

Fixes for errors when attempting import of Sub-SoCs .json
enjoy-digital · Feb 16, 2024 · 677443c · 677443c
2 parents cfbe3b0 + 6c8633b
commit 677443c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/litex/soc/integration/builder.py b/litex/soc/integration/builder.py
@@ -138,8 +138,8 @@ def add_software_package(self, name, src_dir=None):
     def add_software_library(self, name):
         self.software_libraries.append(name)
 
-    def add_json(self, filename, name="", origin=0):
-        self.jsons.append((filename, name, origin))
+    def add_json(self, filename, origin=0, name=""):
+        self.jsons.append((filename, origin, name))
 
     def _get_json_mem_regions(self):
         mem_regions = {}

diff --git a/litex/soc/integration/export.py b/litex/soc/integration/export.py
@@ -129,7 +129,7 @@ def get_linker_output_format(cpu):
 def get_linker_regions(regions):
     r = "MEMORY {\n"
     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"
     return r