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

soc/uart: add configurable UART FIFO depth.

This commit is contained in:
Florent Kermarrec 2020-02-28 22:34:11 +01:00
parent 9199306a65
commit 59e99bfbcd
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -888,10 +888,10 @@ class LiteXSoC(SoC):
self.csr.add(name + "_mem", use_loc_if_exists=True) self.csr.add(name + "_mem", use_loc_if_exists=True)
# Add UART ------------------------------------------------------------------------------------- # Add UART -------------------------------------------------------------------------------------
def add_uart(self, name, baudrate=115200): def add_uart(self, name, baudrate=115200, fifo_depth=16):
from litex.soc.cores import uart from litex.soc.cores import uart
if name in ["stub", "stream"]: if name in ["stub", "stream"]:
self.submodules.uart = uart.UART() self.submodules.uart = uart.UART(tx_fifo_depth=0, rx_fifo_depth=0)
if name == "stub": if name == "stub":
self.comb += self.uart.sink.ready.eq(1) self.comb += self.uart.sink.ready.eq(1)
elif name == "bridge": elif name == "bridge":
@ -914,7 +914,9 @@ class LiteXSoC(SoC):
pads = self.platform.request(name), pads = self.platform.request(name),
clk_freq = self.sys_clk_freq, clk_freq = self.sys_clk_freq,
baudrate = baudrate) baudrate = baudrate)
self.submodules.uart = ResetInserter()(uart.UART(self.uart_phy)) self.submodules.uart = ResetInserter()(uart.UART(self.uart_phy,
tx_fifo_depth = fifo_depth,
rx_fifo_depth = fifo_depth))
self.csr.add("uart_phy", use_loc_if_exists=True) self.csr.add("uart_phy", use_loc_if_exists=True)
self.csr.add("uart", use_loc_if_exists=True) self.csr.add("uart", use_loc_if_exists=True)
self.irq.add("uart", use_loc_if_exists=True) self.irq.add("uart", use_loc_if_exists=True)

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

@ -86,6 +86,7 @@ class SoCCore(LiteXSoC):
with_uart = True, with_uart = True,
uart_name = "serial", uart_name = "serial",
uart_baudrate = 115200, uart_baudrate = 115200,
uart_fifo_depth = 16,
# Timer parameters # Timer parameters
with_timer = True, with_timer = True,
# Controller parameters # Controller parameters
@ -176,7 +177,7 @@ class SoCCore(LiteXSoC):
# Add UART # Add UART
if with_uart: if with_uart:
self.add_uart(name=uart_name, baudrate=uart_baudrate) self.add_uart(name=uart_name, baudrate=uart_baudrate, fifo_depth=uart_fifo_depth)
# Add Timer # Add Timer
if with_timer: if with_timer:
@ -286,8 +287,8 @@ def soc_core_args(parser):
help="UART type/name (default=serial)") help="UART type/name (default=serial)")
parser.add_argument("--uart-baudrate", default=None, type=int, parser.add_argument("--uart-baudrate", default=None, type=int,
help="UART baudrate (default=115200)") help="UART baudrate (default=115200)")
parser.add_argument("--uart-stub", default=False, type=bool, parser.add_argument("--uart-fifo-depth", default=16, type=int,
help="enable UART stub (default=False)") help="UART FIFO depth (default=16)")
# Timer parameters # Timer parameters
parser.add_argument("--with-timer", default=None, type=bool, parser.add_argument("--with-timer", default=None, type=bool,
help="with Timer (default=True)") help="with Timer (default=True)")

3
litex/tools/litex_gen.py
View File

@ -62,6 +62,7 @@ class LiteXCore(SoCMini):
self.submodules.crg = CRG(platform.request("sys_clk"), rst=platform.request("sys_rst")) self.submodules.crg = CRG(platform.request("sys_clk"), rst=platform.request("sys_rst"))
# SoCMini ---------------------------------------------------------------------------------- # SoCMini ----------------------------------------------------------------------------------
print(kwargs)
SoCMini.__init__(self, platform, clk_freq=sys_clk_freq, **kwargs) SoCMini.__init__(self, platform, clk_freq=sys_clk_freq, **kwargs)
# SPI Master # SPI Master
@ -128,6 +129,7 @@ def soc_argdict(args):
"bus", "bus",
"with_pwm", "with_pwm",
"with_uart", "with_uart",
"uart_fifo_depth",
"with_ctrl", "with_ctrl",
"with_timer", "with_timer",
"with_gpio", "with_gpio",
@ -151,6 +153,7 @@ def main():
# Cores # Cores
parser.add_argument("--with-pwm", action="store_true", help="Add PWM core") parser.add_argument("--with-pwm", action="store_true", help="Add PWM core")
parser.add_argument("--with-uart", action="store_true", help="Add UART core") parser.add_argument("--with-uart", action="store_true", help="Add UART core")
parser.add_argument("--uart-fifo-depth", default=16, type=int, help="UART FIFO depth (default=16)")
parser.add_argument("--with-ctrl", action="store_true", help="Add bus controller core") parser.add_argument("--with-ctrl", action="store_true", help="Add bus controller core")
parser.add_argument("--with-timer", action="store_true", help="Add timer core") parser.add_argument("--with-timer", action="store_true", help="Add timer core")
parser.add_argument("--with-spi-master", action="store_true", help="Add SPI master core") parser.add_argument("--with-spi-master", action="store_true", help="Add SPI master core")

4
litex/tools/litex_sim.py
View File

@ -176,7 +176,9 @@ class SimSoC(SoCSDRAM):
# Serial ----------------------------------------------------------------------------------- # Serial -----------------------------------------------------------------------------------
self.submodules.uart_phy = uart.RS232PHYModel(platform.request("serial")) self.submodules.uart_phy = uart.RS232PHYModel(platform.request("serial"))
self.submodules.uart = uart.UART(self.uart_phy) self.submodules.uart = uart.UART(self.uart_phy,
tx_fifo_depth=kwargs["uart_fifo_depth"],
rx_fifo_depth=kwargs["uart_fifo_depth"])
self.add_csr("uart") self.add_csr("uart")
self.add_interrupt("uart") self.add_interrupt("uart")