diff --git a/litex/soc/integration/builder.py b/litex/soc/integration/builder.py
index 209206746..94972c551 100644
--- a/litex/soc/integration/builder.py
+++ b/litex/soc/integration/builder.py
@@ -180,6 +180,7 @@ class Builder:
         self.soc.finalize()
 
         self._generate_includes()
+        self._generate_csr_map()
         if self.soc.cpu_type is not None:
             self._prepare_software()
             self._generate_software(not self.soc.integrated_rom_initialized)
@@ -187,8 +188,6 @@ class Builder:
                 if not self.soc.integrated_rom_initialized:
                     self._initialize_rom()
 
-        self._generate_csr_map()
-
         if "run" not in kwargs:
             kwargs["run"] = self.compile_gateware
         vns = self.soc.build(build_dir=self.gateware_dir, **kwargs)