From dad04eedeffefbe8ee1465bcfe4f6eff5818025d Mon Sep 17 00:00:00 2001 From: Andrew Dennison Date: Tue, 2 Apr 2024 10:42:44 +1100 Subject: [PATCH] integration/export: Fix MockCSRRegion base definition. MockCSR are not related to csr_base --- litex/soc/integration/export.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/litex/soc/integration/export.py b/litex/soc/integration/export.py index b49dab342..5835e7c22 100644 --- a/litex/soc/integration/export.py +++ b/litex/soc/integration/export.py @@ -236,8 +236,9 @@ def _generate_csr_definitions_c(reg_name, reg_base, nwords, csr_base, with_csr_b def _generate_csr_region_definitions_c(name, region, origin, alignment, csr_base, with_csr_base_define): base_define = with_csr_base_define and not isinstance(region, MockCSRRegion) + base = csr_base if not isinstance(region, MockCSRRegion) else 0 region_defs = f"\n/* {name.upper()} Registers */\n" - region_defs += f"#define CSR_{name.upper()}_BASE {_get_csr_addr(csr_base, origin, base_define)}\n" + region_defs += f"#define CSR_{name.upper()}_BASE {_get_csr_addr(base, origin, base_define)}\n" if not isinstance(region.obj, Memory): for csr in region.obj: @@ -246,7 +247,7 @@ def _generate_csr_region_definitions_c(name, region, origin, alignment, csr_base reg_name = name + "_" + csr.name, reg_base = origin, nwords = nr, - csr_base = csr_base, + csr_base = base, with_csr_base_define = base_define, ) origin += alignment // 8 * nr