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

Merge pull request #519 from ozbenh/point2point 

soc: Revive generation of a PointToPoint interconnect
This commit is contained in:
enjoy-digital 2020-05-13 16:48:21 +02:00 committed by GitHub
parent 9f941138d2 1ed6869110
commit 78413cc09e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -824,7 +824,18 @@ class SoC(Module):
# SoC Bus Interconnect --------------------------------------------------------------------- # SoC Bus Interconnect ---------------------------------------------------------------------
bus_masters = self.bus.masters.values() bus_masters = self.bus.masters.values()
bus_slaves = [(self.bus.regions[n].decoder(self.bus), s) for n, s in self.bus.slaves.items()] bus_slaves = [(self.bus.regions[n].decoder(self.bus), s) for n, s in self.bus.slaves.items()]
if len(bus_masters) and len(bus_slaves):
use_p2p = False
if len(bus_masters) == 1 and len(bus_slaves) == 1:
n = list(self.bus.slaves)[0]
if self.bus.regions[n].origin == 0:
use_p2p = True
if use_p2p:
self.submodules.bus_interconnect = wishbone.InterconnectPointToPoint(
master = list(bus_masters)[0],
slave = list(self.bus.slaves.values())[0])
elif len(bus_masters) and len(bus_slaves):
self.submodules.bus_interconnect = wishbone.InterconnectShared( self.submodules.bus_interconnect = wishbone.InterconnectShared(
masters = bus_masters, masters = bus_masters,
slaves = bus_slaves, slaves = bus_slaves,