remove limitation on debug tuple definition

diff --git a/litescope/frontend/la.py b/litescope/frontend/la.py
index 07bb02acfb2c3a090c558986417c8435223f6fa9..696a4ea45ec676c6648b8124a02ee9fa12eb22b5 100644 (file)
--- a/litescope/frontend/la.py
+++ b/litescope/frontend/la.py
@@ -81,6 +81,8 @@ class LiteScopeLA(Module, AutoCSR):
                r += format_line("config", "dw", str(self.dw))
                r += format_line("config", "depth", str(self.depth))
                r += format_line("config", "with_rle", str(int(self.with_rle)))
+               if not isinstance(self.layout, tuple):
+                       self.layout = [self.layout]
                for e in self.layout:
                        r += format_line("layout", vns.get_name(e), str(flen(e)))
                write_to_file(filename, r)

diff --git a/make.py b/make.py
index f3f6304c463d6ebc23843a98c176ef47da066202..09058218bd00a4eb1bb13e8ec5665e13921981ec 100644 (file)
--- a/make.py
+++ b/make.py
@@ -131,7 +131,7 @@ RLE: {}
                write_to_file(args.csr_csv, csr_csv)
 
        if actions["build-bitstream"]:
-               vns = platform.build(soc, build_name=build_name)
+               vns = platform.build(soc, build_name=build_name, run=True)
                if hasattr(soc, "do_exit") and vns is not None:
                        if hasattr(soc.do_exit, '__call__'):
                                soc.do_exit(vns)

diff --git a/targets/simple.py b/targets/simple.py
index 425583702346e30ec8837f9e5f6e520f41e98a80..672744f96b913bd8e735021d6b074ea7fffcdcb4 100644 (file)
--- a/targets/simple.py
+++ b/targets/simple.py
@@ -98,8 +98,7 @@ class LiteScopeSoC(GenSoC, AutoCSR):
                ]
 
                self.debug = (
-                       counter1.value,
-                       Signal()
+                       counter1.value
                )
                self.submodules.la = LiteScopeLA(self.debug, 512, with_rle=True, with_subsampler=True)
                self.la.trigger.add_port(LiteScopeTerm(self.la.dw))