diff --git a/litex_boards/platforms/litex_m2_baseboard.py b/litex_boards/platforms/litex_m2_baseboard.py
index aa54624..03de834 100644
--- a/litex_boards/platforms/litex_m2_baseboard.py
+++ b/litex_boards/platforms/litex_m2_baseboard.py
@@ -25,6 +25,13 @@ _io = [
     ("user_btn", 0, Pins("M19"), IOStandard("LVCMOS33")),
     ("user_btn", 1, Pins("M20"), IOStandard("LVCMOS33")),
 
+    # LCD
+    ("lcd", 0,
+        Subsignal("scl", Pins("P18"), Misc("PULLMODE=UP")),
+        Subsignal("sda", Pins("L20"), Misc("PULLMODE=UP")),
+        IOStandard("LVCMOS33")
+    ),
+
     # RGMII Ethernet
     ("eth_clocks", 0,
         Subsignal("tx", Pins("M1")),
diff --git a/litex_boards/targets/litex_m2_baseboard.py b/litex_boards/targets/litex_m2_baseboard.py
index 2b717db..8166f4c 100755
--- a/litex_boards/targets/litex_m2_baseboard.py
+++ b/litex_boards/targets/litex_m2_baseboard.py
@@ -20,6 +20,7 @@ from litex.soc.cores.clock import *
 from litex.soc.integration.soc_core import *
 from litex.soc.integration.builder import *
 from litex.soc.cores.video import VideoHDMIPHY
+from litex.soc.cores.bitbang import I2CMaster
 
 from liteeth.phy.ecp5rgmii import LiteEthPHYRGMII
 
@@ -66,6 +67,7 @@ class BaseSoC(SoCCore):
         with_ethernet       = False,
         with_etherbone      = False,
         with_video_terminal = False,
+        with_lcd            = False,
         **kwargs):
         platform = litex_m2_baseboard.Platform(toolchain="trellis")
 
@@ -89,12 +91,15 @@ class BaseSoC(SoCCore):
             if with_etherbone:
                 self.add_etherbone(phy=self.ethphy)
 
-
         # Video ------------------------------------------------------------------------------------
         if with_video_terminal:
             self.submodules.videophy = VideoHDMIPHY(platform.request("hdmi"), clock_domain="hdmi", pn_swap=["g", "b"])
             self.add_video_terminal(phy=self.videophy, timings="640x480@75Hz", clock_domain="hdmi")
 
+        # LCD --------------------------------------------------------------------------------------
+        if with_lcd:
+            self.submodules.i2c = I2CMaster(platform.request("lcd"))
+
 # Build --------------------------------------------------------------------------------------------
 
 def main():
@@ -111,6 +116,8 @@ def main():
     sdopts.add_argument("--with-sdcard",     action="store_true", help="Enable SDCard support")
     viopts = parser.add_mutually_exclusive_group()
     viopts.add_argument("--with-video-terminal", action="store_true", help="Enable Video Terminal (HDMI)")
+    parser.add_argument("--with-lcd", action="store_true", help="Enable OLED LCD support")
+
     builder_args(parser)
     soc_core_args(parser)
     trellis_args(parser)
@@ -121,6 +128,7 @@ def main():
         with_ethernet       = args.with_ethernet,
         with_etherbone      = args.with_etherbone,
         with_video_terminal = args.with_video_terminal,
+        with_lcd            = args.with_lcd,
         **soc_core_argdict(args)
     )
     if args.with_spi_sdcard: