From 697ff7447c32e79ef2e75bcf035623cb7997685f Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Fri, 22 Jan 2021 14:17:44 +0100
Subject: [PATCH] soc/integration: add initial JTAG-UART support to UARTbone.

---
 litex/soc/cores/uart.py      | 11 +++++++----
 litex/soc/integration/soc.py |  9 +++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/litex/soc/cores/uart.py b/litex/soc/cores/uart.py
index 0ab6c035d..410fa10e4 100644
--- a/litex/soc/cores/uart.py
+++ b/litex/soc/cores/uart.py
@@ -378,12 +378,12 @@ class Stream2Wishbone(Module):
 
 
 class UARTBone(Stream2Wishbone):
-    def __init__(self, pads, clk_freq, baudrate=115200, cd="sys"):
+    def __init__(self, phy, clk_freq, cd="sys"):
         if cd == "sys":
-            self.submodules.phy = RS232PHY(pads, clk_freq, baudrate)
+            self.submodules.phy = phy
             Stream2Wishbone.__init__(self, self.phy, clk_freq=clk_freq)
         else:
-            self.submodules.phy = ClockDomainsRenamer(cd)(RS232PHY(pads, clk_freq, baudrate))
+            self.submodules.phy = ClockDomainsRenamer(cd)(phy)
             self.submodules.tx_cdc = stream.ClockDomainCrossing([("data", 8)], cd_from="sys", cd_to=cd)
             self.submodules.rx_cdc = stream.ClockDomainCrossing([("data", 8)], cd_from=cd,    cd_to="sys")
             self.comb += self.phy.source.connect(self.rx_cdc.sink)
@@ -392,7 +392,10 @@ class UARTBone(Stream2Wishbone):
             self.comb += self.rx_cdc.source.connect(self.sink)
             self.comb += self.source.connect(self.tx_cdc.sink)
 
-class UARTWishboneBridge(UARTBone): pass
+class UARTWishboneBridge(UARTBone):
+    def __init__(self, pads, clk_freq, baudrate=115200, cd="sys"):
+        self.submodules.phy = RS232PHY(pads, clk_freq, baudrate)
+        UARTBone.__init__(self, self.phy, clk_freq, cd)
 
 # UART Multiplexer ---------------------------------------------------------------------------------
 
diff --git a/litex/soc/integration/soc.py b/litex/soc/integration/soc.py
index 16db19962..efeb719e4 100644
--- a/litex/soc/integration/soc.py
+++ b/litex/soc/integration/soc.py
@@ -1163,10 +1163,15 @@ class LiteXSoC(SoC):
     # Add UARTbone ---------------------------------------------------------------------------------
     def add_uartbone(self, name="serial", clk_freq=None, baudrate=115200, cd="sys"):
         from litex.soc.cores import uart
+        if name == "jtag_uart":
+            from litex.soc.cores.jtag import JTAGPHY
+            phy = JTAGPHY(device=self.platform.device)
+        else:
+            phy = uart.UARTPHY(platform.request(name), clk_freq, bandrate)
+        self.submodules += phy
         self.submodules.uartbone = uart.UARTBone(
-            pads     = self.platform.request(name),
+            phy      = phy,
             clk_freq = clk_freq if clk_freq is not None else self.sys_clk_freq,
-            baudrate = baudrate,
             cd       = cd)
         self.bus.add_master(name="uartbone", master=self.uartbone.wishbone)