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

soc/add_uart: Separate name/uart_name to allow multiple UARTs in the same design.

This commit is contained in:
Florent Kermarrec 2022-01-19 15:42:23 +01:00
parent 6d697f4506
commit fda3164be4
3 changed files with 52 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -19,6 +19,7 @@
- cpu/marocchino: Add initial support. - cpu/marocchino: Add initial support.
- cpu/eos_s3: Add LiteX BIOS/Bare Metal software support. - cpu/eos_s3: Add LiteX BIOS/Bare Metal software support.
- litex_sim: Add .json support for --rom/ram/sdram-init. - litex_sim: Add .json support for --rom/ram/sdram-init.
- soc/add_uart: Allow multiple UARTs in the same design.
[> API changes/Deprecation [> API changes/Deprecation
-------------------------- --------------------------

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

@ -1162,86 +1162,106 @@ class LiteXSoC(SoC):
setattr(self.submodules, name, Identifier(identifier)) setattr(self.submodules, name, Identifier(identifier))
# Add UART ------------------------------------------------------------------------------------- # Add UART -------------------------------------------------------------------------------------
def add_uart(self, name, baudrate=115200, fifo_depth=16): def add_uart(self, name="uart", uart_name="serial", baudrate=115200, fifo_depth=16):
from litex.soc.cores import uart # Imports.
self.check_if_exists("uart") from litex.soc.cores.uart import UART, UARTCrossover
# Core.
self.check_if_exists(name)
# Stub / Stream. # Stub / Stream.
if name in ["stub", "stream"]: if uart_name in ["stub", "stream"]:
self.submodules.uart = uart.UART(tx_fifo_depth=0, rx_fifo_depth=0) uart = UART(tx_fifo_depth=0, rx_fifo_depth=0)
setattr(self.submodules, name, _uart)
if name == "stub": if name == "stub":
self.comb += self.uart.sink.ready.eq(1) self.comb += uart.sink.ready.eq(1)
# UARTBone / Bridge. # UARTBone / Bridge.
elif name in ["uartbone", "bridge"]: elif uart_name in ["uartbone", "bridge"]:
self.add_uartbone(baudrate=baudrate) self.add_uartbone(baudrate=baudrate)
# Crossover. # Crossover.
elif name in ["crossover"]: elif uart_name in ["crossover"]:
self.submodules.uart = uart.UARTCrossover( uart = UARTCrossover(
tx_fifo_depth = fifo_depth, tx_fifo_depth = fifo_depth,
rx_fifo_depth = fifo_depth) rx_fifo_depth = fifo_depth)
setattr(self.submodules, name, uart)
# Crossover + Bridge. # Crossover + Bridge.
elif name in ["crossover+bridge"]: elif uart_name in ["crossover+bridge"]:
self.add_uartbone(baudrate=baudrate) self.add_uartbone(baudrate=baudrate)
self.submodules.uart = uart.UARTCrossover( uart = UARTCrossover(
tx_fifo_depth = fifo_depth, tx_fifo_depth = fifo_depth,
rx_fifo_depth = fifo_depth) rx_fifo_depth = fifo_depth)
setattr(self.submodules, name, uart)
# Model/Sim. # Model/Sim.
elif name in ["model", "sim"]: elif uart_name in ["model", "sim"]:
self.submodules.uart_phy = uart.RS232PHYModel(self.platform.request("serial")) from litex.soc.cores.uart import RS232PHYModel
self.submodules.uart = uart.UART(self.uart_phy, uart_phy = RS232PHYModel(self.platform.request("serial"))
uart = UART(uart_phy,
tx_fifo_depth = fifo_depth, tx_fifo_depth = fifo_depth,
rx_fifo_depth = fifo_depth) rx_fifo_depth = fifo_depth)
setattr(self.submodules, name + "_phy", uart_phy)
setattr(self.submodules, name, uart)
# JTAG Atlantic. # JTAG Atlantic.
elif name in ["jtag_atlantic"]: elif uart_name in ["jtag_atlantic"]:
from litex.soc.cores.jtag import JTAGAtlantic from litex.soc.cores.jtag import JTAGAtlantic
self.submodules.uart_phy = JTAGAtlantic() uart_phy = JTAGAtlantic()
self.submodules.uart = uart.UART(self.uart_phy, uart = UART(uart_phy,
tx_fifo_depth = fifo_depth, tx_fifo_depth = fifo_depth,
rx_fifo_depth = fifo_depth) rx_fifo_depth = fifo_depth)
setattr(self.submodules, name + "_phy", uart_phy)
setattr(self.submodules, name, uart)
# JTAG UART. # JTAG UART.
elif name in ["jtag_uart"]: elif uart_name in ["jtag_uart"]:
from litex.soc.cores.jtag import JTAGPHY from litex.soc.cores.jtag import JTAGPHY
self.clock_domains.cd_sys_jtag = ClockDomain() # Run JTAG-UART in sys_jtag clock domain similar to self.clock_domains.cd_sys_jtag = ClockDomain() # Run JTAG-UART in sys_jtag clock domain similar to
self.comb += self.cd_sys_jtag.clk.eq(ClockSignal("sys")) # sys clock domain but with rst disconnected. self.comb += self.cd_sys_jtag.clk.eq(ClockSignal("sys")) # sys clock domain but with rst disconnected.
self.submodules.uart_phy = JTAGPHY(device=self.platform.device, clock_domain="sys_jtag") uart_phy = JTAGPHY(device=self.platform.device, clock_domain="sys_jtag")
self.submodules.uart = uart.UART(self.uart_phy, uart = UART(uart_phy,
tx_fifo_depth = fifo_depth, tx_fifo_depth = fifo_depth,
rx_fifo_depth = fifo_depth) rx_fifo_depth = fifo_depth)
setattr(self.submodules, name + "_phy", uart_phy)
setattr(self.submodules, name, uart)
# USB ACM (with ValentyUSB core). # USB ACM (with ValentyUSB core).
elif name in ["usb_acm"]: elif uart_name in ["usb_acm"]:
import valentyusb.usbcore.io as usbio import valentyusb.usbcore.io as usbio
import valentyusb.usbcore.cpu.cdc_eptri as cdc_eptri import valentyusb.usbcore.cpu.cdc_eptri as cdc_eptri
usb_pads = self.platform.request("usb") usb_pads = self.platform.request("usb")
usb_iobuf = usbio.IoBuf(usb_pads.d_p, usb_pads.d_n, usb_pads.pullup) usb_iobuf = usbio.IoBuf(usb_pads.d_p, usb_pads.d_n, usb_pads.pullup)
self.clock_domains.cd_sys_usb = ClockDomain() # Run USB ACM in sys_usb clock domain similar to self.clock_domains.cd_sys_usb = ClockDomain() # Run USB ACM in sys_usb clock domain similar to
self.comb += self.cd_sys_usb.clk.eq(ClockSignal("sys")) # sys clock domain but with rst disconnected. self.comb += self.cd_sys_usb.clk.eq(ClockSignal("sys")) # sys clock domain but with rst disconnected.
self.submodules.uart = ClockDomainsRenamer("sys_usb")(cdc_eptri.CDCUsb(usb_iobuf)) uart = ClockDomainsRenamer("sys_usb")(cdc_eptri.CDCUsb(usb_iobuf))
setattr(self.submodules, name, uart)
# Classical UART. # Classical UART.
else: else:
self.submodules.uart_phy = uart.UARTPHY( from litex.soc.cores.uart import UARTPHY
pads = self.platform.request(name), uart_phy = UARTPHY(
pads = self.platform.request(uart_name),
clk_freq = self.sys_clk_freq, clk_freq = self.sys_clk_freq,
baudrate = baudrate) baudrate = baudrate)
self.submodules.uart = uart.UART(self.uart_phy, uart = UART(uart_phy,
tx_fifo_depth = fifo_depth, tx_fifo_depth = fifo_depth,
rx_fifo_depth = fifo_depth) rx_fifo_depth = fifo_depth)
setattr(self.submodules, name + "_phy", uart_phy)
setattr(self.submodules, name, uart)
if self.irq.enabled: if self.irq.enabled:
self.irq.add("uart", use_loc_if_exists=True) self.irq.add(name, use_loc_if_exists=True)
else: else:
self.add_constant("UART_POLLING") self.add_constant("UART_POLLING")
# Add UARTbone --------------------------------------------------------------------------------- # Add UARTbone ---------------------------------------------------------------------------------
def add_uartbone(self, name="serial", clk_freq=None, baudrate=115200, cd="sys"): def add_uartbone(self, name="serial", clk_freq=None, baudrate=115200, cd="sys"):
# Imports.
from litex.soc.cores import uart from litex.soc.cores import uart
# Core.
if clk_freq is None: if clk_freq is None:
clk_freq = self.sys_clk_freq clk_freq = self.sys_clk_freq
self.check_if_exists("uartbone") self.check_if_exists("uartbone")
@ -1251,8 +1271,11 @@ class LiteXSoC(SoC):
# Add JTAGbone --------------------------------------------------------------------------------- # Add JTAGbone ---------------------------------------------------------------------------------
def add_jtagbone(self, chain=1): def add_jtagbone(self, chain=1):
# Imports.
from litex.soc.cores import uart from litex.soc.cores import uart
from litex.soc.cores.jtag import JTAGPHY from litex.soc.cores.jtag import JTAGPHY
# Core.
self.check_if_exists("jtagbone") self.check_if_exists("jtagbone")
self.submodules.jtagbone_phy = JTAGPHY(device=self.platform.device, chain=chain) self.submodules.jtagbone_phy = JTAGPHY(device=self.platform.device, chain=chain)
self.submodules.jtagbone = uart.UARTBone(phy=self.jtagbone_phy, clk_freq=self.sys_clk_freq) self.submodules.jtagbone = uart.UARTBone(phy=self.jtagbone_phy, clk_freq=self.sys_clk_freq)

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

@ -225,7 +225,7 @@ class SoCCore(LiteXSoC):
# Add UART # Add UART
if with_uart: if with_uart:
self.add_uart(name=uart_name, baudrate=uart_baudrate, fifo_depth=uart_fifo_depth) self.add_uart(name="uart", uart_name=uart_name, baudrate=uart_baudrate, fifo_depth=uart_fifo_depth)
# Add Timer # Add Timer
if with_timer: if with_timer: