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

simplify litescope export with do_exit call and remove automatic clean

This commit is contained in:
Florent Kermarrec 2015-02-12 21:04:52 +01:00
parent 61d12a3431
commit f8003c92aa
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make.py
View File

@ -111,16 +111,11 @@ BIST: {}
# 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-core"]:
actions["clean"] = 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
@ -146,7 +141,10 @@ BIST: {}
tools.write_to_file("build/litesata.v", src) tools.write_to_file("build/litesata.v", src)
if actions["build-bitstream"]: if actions["build-bitstream"]:
platform.build(soc, build_name=build_name) vns = platform.build(soc, build_name=build_name, run=False)
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()

8
targets/bist.py
View File

@ -1,4 +1,4 @@
import os, atexit import os
from litesata.common import * from litesata.common import *
from migen.bank import csrgen from migen.bank import csrgen
@ -203,7 +203,6 @@ class BISTSoCDevel(BISTSoC, AutoCSR):
self.submodules.la = LiteScopeLA(debug, 2048) self.submodules.la = LiteScopeLA(debug, 2048)
self.la.trigger.add_port(LiteScopeTerm(self.la.dw)) self.la.trigger.add_port(LiteScopeTerm(self.la.dw))
atexit.register(self.exit, platform)
def do_finalize(self): def do_finalize(self):
BISTSoC.do_finalize(self) BISTSoC.do_finalize(self)
@ -216,8 +215,7 @@ class BISTSoCDevel(BISTSoC, AutoCSR):
self.sata_core_command_tx_fsm_state.eq(self.sata.core.command.tx.fsm.state) self.sata_core_command_tx_fsm_state.eq(self.sata.core.command.tx.fsm.state)
] ]
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 = BISTSoC default_subtarget = BISTSoC