Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove limitation on debug tuple definition

This commit is contained in:
Florent Kermarrec 2015-02-19 10:52:57 +01:00
parent 5f19955825
commit 8e0553670a
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
litescope/frontend/la.py
View File

@ -81,6 +81,8 @@ class LiteScopeLA(Module, AutoCSR):
r += format_line("config", "dw", str(self.dw)) r += format_line("config", "dw", str(self.dw))
r += format_line("config", "depth", str(self.depth)) r += format_line("config", "depth", str(self.depth))
r += format_line("config", "with_rle", str(int(self.with_rle))) 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: for e in self.layout:
r += format_line("layout", vns.get_name(e), str(flen(e))) r += format_line("layout", vns.get_name(e), str(flen(e)))
write_to_file(filename, r) write_to_file(filename, r)

2
make.py
View File

@ -131,7 +131,7 @@ RLE: {}
write_to_file(args.csr_csv, csr_csv) write_to_file(args.csr_csv, csr_csv)
if actions["build-bitstream"]: 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") and vns is not None:
if hasattr(soc.do_exit, '__call__'): if hasattr(soc.do_exit, '__call__'):
soc.do_exit(vns) soc.do_exit(vns)

3
targets/simple.py
View File

@ -98,8 +98,7 @@ class LiteScopeSoC(GenSoC, AutoCSR):
] ]
self.debug = ( self.debug = (
counter1.value, counter1.value
Signal()
) )
self.submodules.la = LiteScopeLA(self.debug, 512, with_rle=True, with_subsampler=True) self.submodules.la = LiteScopeLA(self.debug, 512, with_rle=True, with_subsampler=True)
self.la.trigger.add_port(LiteScopeTerm(self.la.dw)) self.la.trigger.add_port(LiteScopeTerm(self.la.dw))