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

integration/soc: Replace self.add_csr with self.csr.add.

This commit is contained in:
Florent Kermarrec 2021-03-25 08:23:39 +01:00
parent 36bb069b8b
commit e27330b0d9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
litex/soc/integration/soc.py
View File

@ -1243,9 +1243,9 @@ class LiteXSoC(SoC):
# LiteDRAM BIST # LiteDRAM BIST
if with_bist: if with_bist:
self.submodules.sdram_generator = LiteDRAMBISTGenerator(self.sdram.crossbar.get_port()) self.submodules.sdram_generator = LiteDRAMBISTGenerator(self.sdram.crossbar.get_port())
self.add_csr("sdram_generator") self.csr.add("sdram_generator")
self.submodules.sdram_checker = LiteDRAMBISTChecker(self.sdram.crossbar.get_port()) self.submodules.sdram_checker = LiteDRAMBISTChecker(self.sdram.crossbar.get_port())
self.add_csr("sdram_checker") self.csr.add("sdram_checker")
if not with_soc_interconnect: return if not with_soc_interconnect: return
@ -1616,7 +1616,7 @@ class LiteXSoC(SoC):
if with_msi: if with_msi:
msi = LitePCIeMSI() msi = LitePCIeMSI()
setattr(self.submodules, f"{name}_msi", msi) setattr(self.submodules, f"{name}_msi", msi)
self.add_csr(f"{name}_msi") self.csr.add(f"{name}_msi")
self.comb += msi.source.connect(phy.msi) self.comb += msi.source.connect(phy.msi)
self.msis = {} self.msis = {}
@ -1627,7 +1627,7 @@ class LiteXSoC(SoC):
with_buffering = True, buffering_depth=1024, with_buffering = True, buffering_depth=1024,
with_loopback = True) with_loopback = True)
setattr(self.submodules, f"{name}_dma{i}", dma) setattr(self.submodules, f"{name}_dma{i}", dma)
self.add_csr(f"{name}_dma{i}") self.csr.add(f"{name}_dma{i}")
self.msis[f"{name.upper()}_DMA{i}_WRITER"] = dma.writer.irq self.msis[f"{name.upper()}_DMA{i}_WRITER"] = dma.writer.irq
self.msis[f"{name.upper()}_DMA{i}_READER"] = dma.reader.irq self.msis[f"{name.upper()}_DMA{i}_READER"] = dma.reader.irq
self.add_constant("DMA_CHANNELS", ndmas) self.add_constant("DMA_CHANNELS", ndmas)
@ -1647,7 +1647,7 @@ class LiteXSoC(SoC):
vtg = VideoTimingGenerator(default_video_timings=timings) vtg = VideoTimingGenerator(default_video_timings=timings)
vtg = ClockDomainsRenamer(clock_domain)(vtg) vtg = ClockDomainsRenamer(clock_domain)(vtg)
self.submodules.video_colorbars_vtg = vtg self.submodules.video_colorbars_vtg = vtg
self.add_csr("video_colorbars_vtg") self.csr.add("video_colorbars_vtg")
# ColorsBars Pattern. # ColorsBars Pattern.
colorbars = ClockDomainsRenamer(clock_domain)(ColorBarsPattern()) colorbars = ClockDomainsRenamer(clock_domain)(ColorBarsPattern())
@ -1665,7 +1665,7 @@ class LiteXSoC(SoC):
vtg = VideoTimingGenerator(default_video_timings=timings) vtg = VideoTimingGenerator(default_video_timings=timings)
vtg = ClockDomainsRenamer(clock_domain)(vtg) vtg = ClockDomainsRenamer(clock_domain)(vtg)
self.submodules.video_terminal_vtg = vtg self.submodules.video_terminal_vtg = vtg
self.add_csr("video_terminal_vtg") self.csr.add("video_terminal_vtg")
# Video Terminal. # Video Terminal.
vt = VideoTerminal( vt = VideoTerminal(
@ -1696,7 +1696,7 @@ class LiteXSoC(SoC):
vtg = VideoTimingGenerator(default_video_timings=timings) vtg = VideoTimingGenerator(default_video_timings=timings)
vtg = ClockDomainsRenamer(clock_domain)(vtg) vtg = ClockDomainsRenamer(clock_domain)(vtg)
self.submodules.video_framebuffer_vtg = vtg self.submodules.video_framebuffer_vtg = vtg
self.add_csr("video_framebuffer_vtg") self.csr.add("video_framebuffer_vtg")
# Video FrameBuffer. # Video FrameBuffer.
vfb = VideoFrameBuffer(self.sdram.crossbar.get_port(), vfb = VideoFrameBuffer(self.sdram.crossbar.get_port(),
@ -1705,7 +1705,7 @@ class LiteXSoC(SoC):
clock_domain = clock_domain clock_domain = clock_domain
) )
self.submodules.video_framebuffer = vfb self.submodules.video_framebuffer = vfb
self.add_csr("video_framebuffer") self.csr.add("video_framebuffer")
# Connect Video Timing Generator to Video FrameBuffer. # Connect Video Timing Generator to Video FrameBuffer.
self.comb += vtg.source.connect(vfb.vtg_sink) self.comb += vtg.source.connect(vfb.vtg_sink)