M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

Merge branch 'pipistrello-analyzer' into ppp 

* pipistrello-analyzer:
  pipistrello: add rtio.Analyzer()
This commit is contained in:
Robert Jördens 2016-01-18 21:05:02 -07:00
parent 1adeeabbed 57ce78c54d
commit 7e3610c545
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/gateware/targets/pipistrello.py
View File

@ -106,7 +106,8 @@ class NIST_QC1(BaseSoC, AMPSoC):
"rtio": None, # mapped on Wishbone instead "rtio": None, # mapped on Wishbone instead
"rtio_crg": 10, "rtio_crg": 10,
"kernel_cpu": 11, "kernel_cpu": 11,
"rtio_moninj": 12 "rtio_moninj": 12,
"rtio_analyzer": 13
} }
csr_map.update(BaseSoC.csr_map) csr_map.update(BaseSoC.csr_map)
mem_map = { mem_map = {
@ -208,6 +209,9 @@ trce -v 12 -fastpaths -tsi {build_name}.tsi -o {build_name}.twr {build_name}.ncd
self.add_csr_region("rtio", self.mem_map["rtio"] | 0x80000000, 32, self.add_csr_region("rtio", self.mem_map["rtio"] | 0x80000000, 32,
rtio_csrs) rtio_csrs)
self.submodules.rtio_analyzer = rtio.Analyzer(self.rtio,
self.get_native_sdram_if())
def main(): def main():
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(