diff --git a/litex/workshop.py b/litex/workshop.py
index 59abe41..d96103e 100644
--- a/litex/workshop.py
+++ b/litex/workshop.py
@@ -14,7 +14,6 @@ import lxbuildenv
 # Disable pylint's E1101, which breaks completely on migen
 #pylint:disable=E1101
 
-from litex_boards.partner.platforms.fomu_hacker import Platform
 from litex_boards.partner.targets.fomu import _CRG
 
 from litex.soc.integration import SoCCore
@@ -99,8 +98,18 @@ def main():
     parser.add_argument(
         "--no-pll", help="disable pll -- this is easier to route, but may not work", action="store_true"
     )
+    parser.add_argument(
+        "--board", choices=["evt", "pvt", "hacker"], required=True,
+        help="build for a particular hardware board"
+    )
     args = parser.parse_args()
 
+    if args.board == "pvt":
+        from litex_boards.partner.platforms.fomu_pvt import Platform
+    elif args.board == "hacker":
+        from litex_boards.partner.platforms.fomu_hacker import Platform
+    elif args.board == "evt":
+        from litex_boards.partner.platforms.fomu_evt import Platform
     platform = Platform()
     soc = BaseSoC(platform, pnr_seed=args.seed, placer=args.placer, use_pll=not args.no_pll)
     builder = Builder(soc,
diff --git a/litex/workshop_rgb.py b/litex/workshop_rgb.py
index ac9d262..345c294 100644
--- a/litex/workshop_rgb.py
+++ b/litex/workshop_rgb.py
@@ -14,7 +14,6 @@ import lxbuildenv
 # Disable pylint's E1101, which breaks completely on migen
 #pylint:disable=E1101
 
-from litex_boards.partner.platforms.fomu_hacker import Platform
 from litex_boards.partner.targets.fomu import _CRG
 
 from litex.soc.integration import SoCCore
@@ -121,8 +120,18 @@ def main():
     parser.add_argument(
         "--no-pll", help="disable pll -- this is easier to route, but may not work", action="store_true"
     )
+    parser.add_argument(
+        "--board", choices=["evt", "pvt", "hacker"], required=True,
+        help="build for a particular hardware board"
+    )
     args = parser.parse_args()
 
+    if args.board == "pvt":
+        from litex_boards.partner.platforms.fomu_pvt import Platform
+    elif args.board == "hacker":
+        from litex_boards.partner.platforms.fomu_hacker import Platform
+    elif args.board == "evt":
+        from litex_boards.partner.platforms.fomu_evt import Platform
     platform = Platform()
     soc = BaseSoC(platform, pnr_seed=args.seed, placer=args.placer, use_pll=not args.no_pll)
     builder = Builder(soc,