From 8e0553670ab5ca837c0cd23a1a9ee7e7d1958b1e Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Thu, 19 Feb 2015 10:52:57 +0100 Subject: [PATCH] remove limitation on debug tuple definition --- litescope/frontend/la.py | 2 ++ make.py | 2 +- targets/simple.py | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/litescope/frontend/la.py b/litescope/frontend/la.py index 07bb02acf..696a4ea45 100644 --- 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 f3f6304c4..09058218b 100644 --- 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 425583702..672744f96 100644 --- 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))