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

soc/integration/soc_core: allow disabling wishbone timeout

This commit is contained in:
Florent Kermarrec 2019-01-29 12:45:59 +01:00
parent 05dcb5cadc
commit 57b8bdd530
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
litex/soc/integration/soc_core.py
View File

@ -128,6 +128,7 @@ class SoCCore(Module):
csr_data_width=8, csr_address_width=14, csr_expose=False, csr_data_width=8, csr_address_width=14, csr_expose=False,
with_uart=True, uart_name="serial", uart_baudrate=115200, uart_stub=False, with_uart=True, uart_name="serial", uart_baudrate=115200, uart_stub=False,
ident="", ident_version=False, ident="", ident_version=False,
wishbone_timeout_cycles=1e6,
reserve_nmi_interrupt=True, reserve_nmi_interrupt=True,
with_timer=True, with_timer=True,
with_ctrl=True): with_ctrl=True):
@ -155,6 +156,8 @@ class SoCCore(Module):
self.shadow_base = shadow_base self.shadow_base = shadow_base
self.wishbone_timeout_cycles = wishbone_timeout_cycles
self.csr_data_width = csr_data_width self.csr_data_width = csr_data_width
self.csr_address_width = csr_address_width self.csr_address_width = csr_address_width
self.csr_expose = csr_expose self.csr_expose = csr_expose
@ -363,8 +366,8 @@ class SoCCore(Module):
if len(self._wb_masters): if len(self._wb_masters):
# Wishbone # Wishbone
self.submodules.wishbonecon = wishbone.InterconnectShared(self._wb_masters, self.submodules.wishbonecon = wishbone.InterconnectShared(self._wb_masters,
self._wb_slaves, register=True) self._wb_slaves, register=True, timeout_cycles=self.wishbone_timeout_cycles)
if self.with_ctrl: if self.with_ctrl and (self.wishbone_timeout_cycles is not None):
self.comb += self.ctrl.bus_error.eq(self.wishbonecon.timeout.error) self.comb += self.ctrl.bus_error.eq(self.wishbonecon.timeout.error)
# CSR # CSR

1
litex/soc/interconnect/wishbone.py
View File

@ -157,6 +157,7 @@ class InterconnectShared(Module):
shared = Interface() shared = Interface()
self.submodules.arbiter = Arbiter(masters, shared) self.submodules.arbiter = Arbiter(masters, shared)
self.submodules.decoder = Decoder(shared, slaves, register) self.submodules.decoder = Decoder(shared, slaves, register)
if timeout_cycles is not None:
self.submodules.timeout = Timeout(shared, timeout_cycles) self.submodules.timeout = Timeout(shared, timeout_cycles)