From d4c1c97cf96235063269ec055546f020f8ff592d Mon Sep 17 00:00:00 2001 From: Richard Tucker Date: Fri, 16 Feb 2024 15:16:32 +1100 Subject: [PATCH 1/2] soc/integration/export: fix incorrect element in get_linker_regions --- litex/soc/integration/export.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/litex/soc/integration/export.py b/litex/soc/integration/export.py index 487a36041..f04b03fef 100644 --- 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 From 6c8633b9a39afb1402abb5c1db97b54d3c2e8e71 Mon Sep 17 00:00:00 2001 From: Richard Tucker Date: Fri, 16 Feb 2024 15:15:05 +1100 Subject: [PATCH 2/2] soc/integration/builder: add_json: fix order of parameters For consistancy only. This now matches load_csr_json. Link: https://git.motec.com.au/id/Ibe2889fafc6ef48a6f217f84246de11a9555811d --- litex/soc/integration/builder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/litex/soc/integration/builder.py b/litex/soc/integration/builder.py index 955c29293..dfe0fc7b7 100644 --- a/litex/soc/integration/builder.py +++ b/litex/soc/integration/builder.py @@ -138,8 +138,8 @@ class Builder: 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 = {}