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

simplify LiteScopeLA export (use vns from platform on atexit)

This commit is contained in:
Florent Kermarrec 2015-01-23 09:10:14 +01:00
parent 6003b8af02
commit ef440274fe
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
targets/bist.py
View File

@ -1,4 +1,4 @@
import os import os, atexit
from litesata.common import * from litesata.common import *
from migen.bank import csrgen from migen.bank import csrgen
@ -137,7 +137,7 @@ class BISTSoC(GenSoC, AutoCSR):
} }
csr_map.update(GenSoC.csr_map) csr_map.update(GenSoC.csr_map)
def __init__(self, platform, export_conf=False): def __init__(self, platform):
clk_freq = 166*1000000 clk_freq = 166*1000000
GenSoC.__init__(self, platform, clk_freq) GenSoC.__init__(self, platform, clk_freq)
self.submodules.crg = _CRG(platform) self.submodules.crg = _CRG(platform)
@ -155,8 +155,8 @@ class BISTSoCDevel(BISTSoC, AutoCSR):
"la": 10 "la": 10
} }
csr_map.update(BISTSoC.csr_map) csr_map.update(BISTSoC.csr_map)
def __init__(self, platform, export_conf=False): def __init__(self, platform):
BISTSoC.__init__(self, platform, export_conf) BISTSoC.__init__(self, platform)
self.sata_core_link_rx_fsm_state = Signal(4) self.sata_core_link_rx_fsm_state = Signal(4)
self.sata_core_link_tx_fsm_state = Signal(4) self.sata_core_link_tx_fsm_state = Signal(4)
@ -165,7 +165,7 @@ class BISTSoCDevel(BISTSoC, AutoCSR):
self.sata_core_command_rx_fsm_state = Signal(4) self.sata_core_command_rx_fsm_state = Signal(4)
self.sata_core_command_tx_fsm_state = Signal(4) self.sata_core_command_tx_fsm_state = Signal(4)
debug = ( self.debug = (
self.sata_phy.ctrl.ready, self.sata_phy.ctrl.ready,
self.sata_phy.source.stb, self.sata_phy.source.stb,
@ -202,10 +202,9 @@ class BISTSoCDevel(BISTSoC, AutoCSR):
self.sata_core_command_tx_fsm_state, self.sata_core_command_tx_fsm_state,
) )
self.submodules.la = LiteScopeLA(depth=2048, dat=Cat(*debug)) self.submodules.la = LiteScopeLA(2048, self.debug)
self.la.add_port(LiteScopeTerm) self.la.add_port(LiteScopeTerm)
if export_conf: atexit.register(self.exit, platform)
self.la.export(self, debug,"./test/la.csv")
def do_finalize(self): def do_finalize(self):
BISTSoC.do_finalize(self) BISTSoC.do_finalize(self)
@ -218,4 +217,8 @@ 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):
if platform.vns is not None:
self.la.export(self.debug, platform.vns, "./test/la.csv")
default_subtarget = BISTSoC default_subtarget = BISTSoC