soc/CSR: show alignment in report and add info when updating.
authorFlorent Kermarrec <florent@enjoy-digital.fr>
Wed, 12 Feb 2020 20:55:30 +0000 (21:55 +0100)
committerFlorent Kermarrec <florent@enjoy-digital.fr>
Wed, 12 Feb 2020 20:55:30 +0000 (21:55 +0100)
litex/soc/integration/soc.py

index c72e44692440f9828aae071822592d09263ccd83..43a03bfff0b93c0f110f27bc96380b0d9114e99a 100755 (executable)
@@ -482,8 +482,9 @@ class SoCCSRHandler(SoCLocHandler):
         self.paging        = paging
         self.masters       = {}
         self.regions       = {}
-        self.logger.info("{}-bit CSR Bus, {}KiB Address Space, {}B Paging (Up to {} Locations).".format(
+        self.logger.info("{}-bit CSR Bus, {}-bit Aligned, {}KiB Address Space, {}B Paging (Up to {} Locations).".format(
             colorer(self.data_width),
+            colorer(self.alignment),
             colorer(2**self.address_width/2**10),
             colorer(self.paging),
             colorer(self.n_locs)))
@@ -504,6 +505,10 @@ class SoCCSRHandler(SoCLocHandler):
                 colorer(alignment),
                 colorer(", ".join(str(x) for x in self.supported_alignment))))
             raise
+        self.logger.info("Alignment {} from {}-bit to {}-bit.".format(
+            colorer("updated", color="cyan"),
+            colorer(self.alignment),
+            colorer(alignment)))
         self.alignment = alignment
 
     # Add Master -----------------------------------------------------------------------------------
@@ -547,8 +552,9 @@ class SoCCSRHandler(SoCLocHandler):
 
     # Str ------------------------------------------------------------------------------------------
     def __str__(self):
-        r = "{}-bit CSR Bus, {}KiB Address Space, {}B Paging (Up to {} Locations).\n".format(
+        r = "{}-bit CSR Bus, {}-bit Aligned, {}KiB Address Space, {}B Paging (Up to {} Locations).\n".format(
             colorer(self.data_width),
+            colorer(self.alignment),
             colorer(2**self.address_width/2**10),
             colorer(self.paging),
             colorer(self.n_locs))