simplify litescope export with do_exit call and remove automatic clean

This commit is contained in:
Florent Kermarrec 2015-02-12 21:15:29 +01:00
parent 989cca24bc
commit 04f7fbd7e2
2 changed files with 8 additions and 8 deletions

View File

@ -111,15 +111,14 @@ RLE: {}
str(soc.la.with_rle) str(soc.la.with_rle)
) )
) )
# dependencies # dependencies
if actions["all"]: if actions["all"]:
actions["clean"] = True
actions["build-csr-csv"] = True actions["build-csr-csv"] = True
actions["build-bitstream"] = True actions["build-bitstream"] = True
actions["load-bitstream"] = True actions["load-bitstream"] = True
if actions["build-bitstream"]: if actions["build-bitstream"]:
actions["clean"] = True
actions["build-csr-csv"] = True actions["build-csr-csv"] = True
actions["build-bitstream"] = True actions["build-bitstream"] = True
actions["load-bitstream"] = True actions["load-bitstream"] = True
@ -132,7 +131,10 @@ 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"]:
platform.build(soc, build_name=build_name) vns = platform.build(soc, build_name=build_name)
if hasattr(soc, "do_exit") and vns is not None:
if hasattr(soc.do_exit, '__call__'):
soc.do_exit(vns)
if actions["load-bitstream"]: if actions["load-bitstream"]:
prog = platform.create_programmer() prog = platform.create_programmer()

View File

@ -1,4 +1,4 @@
import os, atexit import os
from migen.bank import csrgen from migen.bank import csrgen
from migen.bus import wishbone, csr from migen.bus import wishbone, csr
@ -99,10 +99,8 @@ class LiteScopeSoC(GenSoC, AutoCSR):
) )
self.submodules.la = LiteScopeLA(self.debug, 512, with_subsampler=True) self.submodules.la = LiteScopeLA(self.debug, 512, with_subsampler=True)
self.la.trigger.add_port(LiteScopeTerm(self.la.dw)) self.la.trigger.add_port(LiteScopeTerm(self.la.dw))
atexit.register(self.exit, platform)
def exit(self, platform): def do_exit(self, vns):
if platform.vns is not None: self.la.export(vns, "test/la.csv")
self.la.export(platform.vns, "./test/la.csv")
default_subtarget = LiteScopeSoC default_subtarget = LiteScopeSoC