soc/cores: Make sure all Modules are switched to LiteXModule.
This commit is contained in:
parent
a2820cba96
commit
48f27707d1
|
@ -106,7 +106,7 @@ class NXOSCA(LiteXModule):
|
||||||
|
|
||||||
# Lattice / NX PLL ---------------------------------------------------------------------------------
|
# Lattice / NX PLL ---------------------------------------------------------------------------------
|
||||||
|
|
||||||
class NXPLL(Module):
|
class NXPLL(LiteXModule):
|
||||||
nclkouts_max = 5
|
nclkouts_max = 5
|
||||||
clki_div_range = ( 1, 128+1)
|
clki_div_range = ( 1, 128+1)
|
||||||
clkfb_div_range = ( 1, 128+1)
|
clkfb_div_range = ( 1, 128+1)
|
||||||
|
|
|
@ -73,7 +73,7 @@ def add_manifest_sources(platform, manifest):
|
||||||
|
|
||||||
# OBI <> Wishbone ----------------------------------------------------------------------------------
|
# OBI <> Wishbone ----------------------------------------------------------------------------------
|
||||||
|
|
||||||
class OBI2Wishbone(Module):
|
class OBI2Wishbone(LiteXModule):
|
||||||
def __init__(self, obi, wb):
|
def __init__(self, obi, wb):
|
||||||
addr = Signal.like(obi.addr)
|
addr = Signal.like(obi.addr)
|
||||||
be = Signal.like(obi.be)
|
be = Signal.like(obi.be)
|
||||||
|
@ -123,7 +123,7 @@ class OBI2Wishbone(Module):
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
class Wishbone2OBI(Module):
|
class Wishbone2OBI(LiteXModule):
|
||||||
def __init__(self, wb, obi):
|
def __init__(self, wb, obi):
|
||||||
self.fsm = fsm = FSM(reset_state="IDLE")
|
self.fsm = fsm = FSM(reset_state="IDLE")
|
||||||
fsm.act("IDLE",
|
fsm.act("IDLE",
|
||||||
|
@ -147,7 +147,7 @@ class Wishbone2OBI(Module):
|
||||||
|
|
||||||
# Wishbone <> APB ----------------------------------------------------------------------------------
|
# Wishbone <> APB ----------------------------------------------------------------------------------
|
||||||
|
|
||||||
class Wishbone2APB(Module):
|
class Wishbone2APB(LiteXModule):
|
||||||
def __init__(self, wb, apb):
|
def __init__(self, wb, apb):
|
||||||
self.fsm = fsm = FSM(reset_state="IDLE")
|
self.fsm = fsm = FSM(reset_state="IDLE")
|
||||||
fsm.act("IDLE",
|
fsm.act("IDLE",
|
||||||
|
@ -171,7 +171,7 @@ class Wishbone2APB(Module):
|
||||||
|
|
||||||
# Debug Module -------------------------------------------------------------------------------------
|
# Debug Module -------------------------------------------------------------------------------------
|
||||||
|
|
||||||
class DebugModule(Module):
|
class DebugModule(LiteXModule):
|
||||||
jtag_layout = [
|
jtag_layout = [
|
||||||
("tck", 1),
|
("tck", 1),
|
||||||
("tms", 1),
|
("tms", 1),
|
||||||
|
|
|
@ -13,7 +13,7 @@ from litex.soc.cores.cpu import CPU
|
||||||
|
|
||||||
# AHB Flash ----------------------------------------------------------------------------------------
|
# AHB Flash ----------------------------------------------------------------------------------------
|
||||||
|
|
||||||
class AHBFlash(Module):
|
class AHBFlash(LiteXModule):
|
||||||
def __init__(self, bus):
|
def __init__(self, bus):
|
||||||
addr = Signal(13)
|
addr = Signal(13)
|
||||||
read = Signal()
|
read = Signal()
|
||||||
|
|
|
@ -45,7 +45,7 @@ obi_layout = [
|
||||||
("rdata", 32),
|
("rdata", 32),
|
||||||
]
|
]
|
||||||
|
|
||||||
class OBI2Wishbone(Module):
|
class OBI2Wishbone(LiteXModule):
|
||||||
def __init__(self, obi, wb):
|
def __init__(self, obi, wb):
|
||||||
addr = Signal.like(obi.addr)
|
addr = Signal.like(obi.addr)
|
||||||
be = Signal.like(obi.be)
|
be = Signal.like(obi.be)
|
||||||
|
|
|
@ -236,7 +236,7 @@ class Microwatt(CPU):
|
||||||
|
|
||||||
# XICS Slave ---------------------------------------------------------------------------------------
|
# XICS Slave ---------------------------------------------------------------------------------------
|
||||||
|
|
||||||
class XICSSlave(Module, AutoCSR):
|
class XICSSlave(LiteXModule):
|
||||||
def __init__(self, platform, core_irq_out=Signal(), int_level_in=Signal(16), variant="standard"):
|
def __init__(self, platform, core_irq_out=Signal(), int_level_in=Signal(16), variant="standard"):
|
||||||
self.variant = variant
|
self.variant = variant
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ apb_layout = [
|
||||||
|
|
||||||
# Wishbone <> APB ----------------------------------------------------------------------------------
|
# Wishbone <> APB ----------------------------------------------------------------------------------
|
||||||
|
|
||||||
class Wishbone2APB(Module):
|
class Wishbone2APB(LiteXModule):
|
||||||
def __init__(self, wb, apb):
|
def __init__(self, wb, apb):
|
||||||
assert wb.data_width == 32
|
assert wb.data_width == 32
|
||||||
self.fsm = fsm = FSM(reset_state="IDLE")
|
self.fsm = fsm = FSM(reset_state="IDLE")
|
||||||
|
|
|
@ -82,7 +82,7 @@ GCC_FLAGS = {
|
||||||
|
|
||||||
# VexRiscv Timer -----------------------------------------------------------------------------------
|
# VexRiscv Timer -----------------------------------------------------------------------------------
|
||||||
|
|
||||||
class VexRiscvTimer(Module, AutoCSR):
|
class VexRiscvTimer(LiteXModule):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self._latch = CSR()
|
self._latch = CSR()
|
||||||
self._time = CSRStatus(64)
|
self._time = CSRStatus(64)
|
||||||
|
|
|
@ -11,6 +11,7 @@ from litex.gen import *
|
||||||
|
|
||||||
from litex.soc.interconnect import wishbone
|
from litex.soc.interconnect import wishbone
|
||||||
|
|
||||||
|
# EMIF (External Memory Interface) -----------------------------------------------------------------
|
||||||
|
|
||||||
class EMIF(LiteXModule):
|
class EMIF(LiteXModule):
|
||||||
"""External Memory Interface core
|
"""External Memory Interface core
|
||||||
|
|
|
@ -14,6 +14,7 @@ from litex.soc.interconnect.csr_eventmanager import *
|
||||||
|
|
||||||
from litex.soc.integration.doc import AutoDoc, ModuleDoc
|
from litex.soc.integration.doc import AutoDoc, ModuleDoc
|
||||||
|
|
||||||
|
# 7-Series SPI OPI ---------------------------------------------------------------------------------
|
||||||
|
|
||||||
class S7SPIOPI(LiteXModule):
|
class S7SPIOPI(LiteXModule):
|
||||||
def __init__(self, pads,
|
def __init__(self, pads,
|
||||||
|
|
Loading…
Reference in New Issue