builder: use the SoC's existing shadow base with get_csr_header()
authorGabriel Somlo <gsomlo@gmail.com>
Tue, 8 Oct 2019 18:28:50 +0000 (14:28 -0400)
committerGabriel Somlo <gsomlo@gmail.com>
Tue, 8 Oct 2019 18:28:50 +0000 (14:28 -0400)
Both the SoC and get_csr_header() have independently set defaults
for the value of 'shadow_base'. If the SoC's value was modified,
ensure that get_csr_header() uses the modified value instead of
its own default.

Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
litex/soc/integration/builder.py

index 1120e4ccbb23ac05be5e3ed43929175479eb6129..c1adcd190c376d61a61172963733a231e07efcf4 100644 (file)
@@ -109,7 +109,10 @@ class Builder:
             cpu_interface.get_mem_header(self.soc.mem_regions))
         write_to_file(
             os.path.join(generated_dir, "csr.h"),
-            cpu_interface.get_csr_header(self.soc.csr_regions, self.soc.constants))
+            cpu_interface.get_csr_header(self.soc.csr_regions,
+                                         self.soc.constants,
+                                         shadow_base=self.soc.shadow_base)
+        )
         write_to_file(
             os.path.join(generated_dir, "git.h"),
             cpu_interface.get_git_header()