diff --git a/litex/tools/litex_client.py b/litex/tools/litex_client.py
index ee6ab39e4..9053a376c 100644
--- a/litex/tools/litex_client.py
+++ b/litex/tools/litex_client.py
@@ -31,8 +31,11 @@ class RemoteClient(EtherboneIPC, CSRBuilder):
             csr_data_width = 32
         self.host         = host
         self.port         = port
-        self.base_address = base_address
         self.debug        = debug
+        if base_address is not None:
+            self.base_address = base_address
+        else:
+            self.base_address = 0
 
     def open(self):
         if hasattr(self, "socket"):
diff --git a/litex/tools/litex_term.py b/litex/tools/litex_term.py
index 606d7d60d..833981d10 100755
--- a/litex/tools/litex_term.py
+++ b/litex/tools/litex_term.py
@@ -87,8 +87,8 @@ else:
 from litex import RemoteClient
 
 class BridgeUART:
-    def __init__(self, name="uart_xover", host="localhost", base_address=0): # FIXME: add command line arguments
-        self.bus = RemoteClient(host=host, base_address=base_address)
+    def __init__(self, name="uart_xover", host="localhost", base_address=None, csr_csv=None): # FIXME: add command line arguments
+        self.bus = RemoteClient(host=host, base_address=base_address, csr_csv=csr_csv)
         present = False
         for k, v in self.bus.regs.d.items():
             if f"{name}_" in k:
@@ -97,6 +97,10 @@ class BridgeUART:
         if not present:
             raise ValueError(f"CrossoverUART {name} not present in design.")
 
+        # On PCIe designs, CSR is remapped to 0 to limit BAR0 size.
+        if base_address is None and hasattr(self.bus.bases, "pcie_phy"):
+            self.bus.base_address = -self.bus.mems.csr.base
+
     def open(self):
         self.bus.open()
         self.file, self.name = pty.openpty()
@@ -534,17 +538,19 @@ class LiteXTerm:
 def _get_args():
     parser = argparse.ArgumentParser()
     parser.add_argument("port",                                              help="Serial port (eg /dev/tty*, bridge, jtag)")
-    parser.add_argument("--speed",       default=115200,                     help="Serial baudrate")
-    parser.add_argument("--serial-boot", default=False, action='store_true', help="Automatically initiate serial boot")
-    parser.add_argument("--kernel",      default=None,                       help="Kernel image")
-    parser.add_argument("--kernel-adr",  default="0x40000000",               help="Kernel address")
-    parser.add_argument("--images",      default=None,                       help="JSON description of the images to load to memory")
+    parser.add_argument("--speed",        default=115200,                     help="Serial baudrate")
+    parser.add_argument("--serial-boot",  default=False, action='store_true', help="Automatically initiate serial boot")
+    parser.add_argument("--kernel",       default=None,                       help="Kernel image")
+    parser.add_argument("--kernel-adr",   default="0x40000000",               help="Kernel address")
+    parser.add_argument("--images",       default=None,                       help="JSON description of the images to load to memory")
 
-    parser.add_argument("--bridge-name", default="uart_xover",               help="Bridge UART name to use (present in design/csr.csv)")
+    parser.add_argument("--csr-csv",      default=None,                       help="SoC mapping file")
+    parser.add_argument("--base-address", default=None,                       help="CSR base address")
+    parser.add_argument("--bridge-name",  default="uart_xover",               help="Bridge UART name to use (present in design/csr.csv)")
 
-    parser.add_argument("--jtag-name",   default="jtag_uart",                help="JTAG UART type: jtag_uart (default), jtag_atlantic")
-    parser.add_argument("--jtag-config", default="openocd_xc7_ft2232.cfg",   help="OpenOCD JTAG configuration file for jtag_uart")
-    parser.add_argument("--jtag-chain",  default=1,                          help="JTAG chain.")
+    parser.add_argument("--jtag-name",    default="jtag_uart",                help="JTAG UART type: jtag_uart (default), jtag_atlantic")
+    parser.add_argument("--jtag-config",  default="openocd_xc7_ft2232.cfg",   help="OpenOCD JTAG configuration file for jtag_uart")
+    parser.add_argument("--jtag-chain",   default=1,                          help="JTAG chain.")
     return parser.parse_args()
 
 def main():
@@ -555,7 +561,11 @@ def main():
         if args.port in ["bridge", "jtag"]:
             raise NotImplementedError
     if args.port in ["bridge", "crossover"]: # FIXME: 2021-02-18, crossover for retro-compatibility remove and update targets?
-        bridge = BridgeUART(name=args.bridge_name)
+        if args.base_address is not None:
+            base_address = int(args.base_address)
+        else:
+            base_address = None
+        bridge = BridgeUART(base_address=base_address,csr_csv=args.csr_csv,name=args.bridge_name)
         bridge.open()
         port = os.ttyname(bridge.name)
     elif args.port in ["jtag"]: