Update references to deprecated platform names.

19 files changed, 48 insertions, 44 deletions

diff --git a/amaranth_boards/alchitry_au.py b/amaranth_boards/alchitry_au.py
index 49a7a51..bcc637d 100644
--- a/amaranth_boards/alchitry_au.py
+++ b/amaranth_boards/alchitry_au.py
@@ -3,7 +3,7 @@ import subprocess
 import shutil
 
 from amaranth.build import *
-from amaranth.vendor.xilinx_7series import *
+from amaranth.vendor.xilinx import *
 from .resources import *
 
 
@@ -20,7 +20,7 @@ def find_loader():
     return (loader_prgm, bridge_bin)
 
 
-class AlchitryAuPlatform(Xilinx7SeriesPlatform):
+class AlchitryAuPlatform(XilinxPlatform):
     device      = "XC7A35T" # Artix 7 33K LEs
     package     = "FTG256"
     speed       = "1"
diff --git a/amaranth_boards/arty_a7.py b/amaranth_boards/arty_a7.py
index 3032349..e15b85c 100644
--- a/amaranth_boards/arty_a7.py
+++ b/amaranth_boards/arty_a7.py
@@ -2,14 +2,14 @@ import os
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx_7series import *
+from amaranth.vendor.xilinx import *
 from .resources import *
 
 
 __all__ = ["ArtyA7_35Platform", "ArtyA7_100Platform"]
 
 
-class _ArtyA7Platform(Xilinx7SeriesPlatform):
+class _ArtyA7Platform(XilinxPlatform):
     package     = "csg324"
     speed       = "1L"
     default_clk = "clk100"
diff --git a/amaranth_boards/arty_s7.py b/amaranth_boards/arty_s7.py
index 5122617..9c01fbc 100644
--- a/amaranth_boards/arty_s7.py
+++ b/amaranth_boards/arty_s7.py
@@ -3,14 +3,14 @@ import textwrap
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx_7series import *
+from amaranth.vendor.xilinx import *
 from .resources import *
 
 
 __all__ = ["ArtyS7_25Platform", "ArtyS7_50Platform"]
 
 
-class _ArtyS7Platform(Xilinx7SeriesPlatform):
+class _ArtyS7Platform(XilinxPlatform):
     package     = "csga324"
     speed       = "1"
     default_clk = "clk100"
diff --git a/amaranth_boards/arty_z7.py b/amaranth_boards/arty_z7.py
index 48b75e0..d4ac9ad 100644
--- a/amaranth_boards/arty_z7.py
+++ b/amaranth_boards/arty_z7.py
@@ -2,14 +2,14 @@ import os
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx_7series import *
+from amaranth.vendor.xilinx import *
 from .resources import *
 
 
 __all__ = ["ArtyZ720Platform"]
 
 
-class ArtyZ720Platform(Xilinx7SeriesPlatform):
+class ArtyZ720Platform(XilinxPlatform):
     device      = "xc7z020"
     package     = "clg400"
     speed       = "1"
diff --git a/amaranth_boards/atlys.py b/amaranth_boards/atlys.py
index 96b5a26..64b106e 100644
--- a/amaranth_boards/atlys.py
+++ b/amaranth_boards/atlys.py
@@ -2,14 +2,14 @@ import subprocess
 import textwrap
 
 from amaranth.build import *
-from amaranth.vendor.xilinx_spartan_3_6 import *
+from amaranth.vendor.xilinx import *
 from .resources import *
 
 
 __all__ = ["AtlysPlatform"]
 
 
-class AtlysPlatform(XilinxSpartan6Platform):
+class AtlysPlatform(XilinxPlatform):
     """Platform file for Digilent Atlys Spartan 6 board.
     https://reference.digilentinc.com/reference/programmable-logic/atlys/start"""
 
diff --git a/amaranth_boards/ebaz4205.py b/amaranth_boards/ebaz4205.py
index eb4a692..b51eed4 100644
--- a/amaranth_boards/ebaz4205.py
+++ b/amaranth_boards/ebaz4205.py
@@ -2,14 +2,14 @@ import os
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx_7series import *
+from amaranth.vendor.xilinx import *
 from .resources import *
 
 
 __all__ = ["EBAZ4205Platform"]
 
 
-class EBAZ4205Platform(Xilinx7SeriesPlatform):
+class EBAZ4205Platform(XilinxPlatform):
     device      = "xc7z010"
     package     = "clg400"
     speed       = "1"
diff --git a/amaranth_boards/genesys2.py b/amaranth_boards/genesys2.py
index 31ac39d..f07107f 100644
--- a/amaranth_boards/genesys2.py
+++ b/amaranth_boards/genesys2.py
@@ -2,14 +2,14 @@ import os
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx_7series import *
+from amaranth.vendor.xilinx import *
 from .resources import *
 
 
 __all__ = ["Genesys2Platform"]
 
 
-class Genesys2Platform(Xilinx7SeriesPlatform):
+class Genesys2Platform(XilinxPlatform):
     """Platform file for Diglient Genesys2 Kitex-7 board.
     https://reference.digilentinc.com/reference/programmable-logic/genesys-2/start"""
 
diff --git a/amaranth_boards/kc705.py b/amaranth_boards/kc705.py
index d513da2..8bc6452 100644
--- a/amaranth_boards/kc705.py
+++ b/amaranth_boards/kc705.py
@@ -2,14 +2,14 @@ import os
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx_7series import *
+from amaranth.vendor.xilinx import *
 from .resources import *
 
 
 __all__ = ["KC705Platform"]
 
 
-class KC705Platform(Xilinx7SeriesPlatform):
+class KC705Platform(XilinxPlatform):
     device      = "xc7k325t"
     package     = "ffg900"
     speed       = "2"
diff --git a/amaranth_boards/kcu105.py b/amaranth_boards/kcu105.py
index 1a886d2..15072db 100644
--- a/amaranth_boards/kcu105.py
+++ b/amaranth_boards/kcu105.py
@@ -2,14 +2,14 @@ import os
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx_ultrascale import *
+from amaranth.vendor.xilinx import *
 from .resources import *
 
 
 __all__ = ["KCU105Platform"]
 
 
-class KCU105Platform(XilinxUltraScalePlatform):
+class KCU105Platform(XilinxPlatform):
     device      = "xcku040"
     package     = "ffva1156"
     speed       = "2-e"
diff --git a/amaranth_boards/mercury.py b/amaranth_boards/mercury.py
index 59b61c1..b45cedc 100644
--- a/amaranth_boards/mercury.py
+++ b/amaranth_boards/mercury.py
@@ -2,14 +2,14 @@ import os
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx_spartan_3_6 import *
+from amaranth.vendor.xilinx import *
 from .resources import *
 
 
 __all__ = ["MercuryPlatform"]
 
 
-class MercuryPlatform(XilinxSpartan3APlatform):
+class MercuryPlatform(XilinxPlatform):
     """
     Original Mercury Board from Micro-Nova: https://www.micro-nova.com
 
diff --git a/amaranth_boards/microzed_z010.py b/amaranth_boards/microzed_z010.py
index 799720f..727bf69 100644
--- a/amaranth_boards/microzed_z010.py
+++ b/amaranth_boards/microzed_z010.py
@@ -1,13 +1,15 @@
 from amaranth.build import *
-from amaranth.vendor.xilinx_7series import *
+from amaranth.vendor.xilinx import *
+
 
 __all__ = ["MicroZedZ010Platform"]
 
-class MicroZedZ010Platform(Xilinx7SeriesPlatform):
-    device = "xc7z010"
-    package = "clg400"
-    speed = "1"
-    resources = []
+
+class MicroZedZ010Platform(XilinxPlatform):
+    device     = "xc7z010"
+    package    = "clg400"
+    speed      = "1"
+    resources  = []
     connectors = [
         Connector("JX1", 0,
             "F9  J6  "
diff --git a/amaranth_boards/microzed_z020.py b/amaranth_boards/microzed_z020.py
index 87b763a..3f7badd 100644
--- a/amaranth_boards/microzed_z020.py
+++ b/amaranth_boards/microzed_z020.py
@@ -1,13 +1,15 @@
 from amaranth.build import *
-from amaranth.vendor.xilinx_7series import *
+from amaranth.vendor.xilinx import *
+
 
 __all__ = ["MicroZedZ020Platform"]
 
-class MicroZedZ020Platform(Xilinx7SeriesPlatform):
-    device = "xc7z020"
-    package = "clg400"
-    speed = "1"
-    resources = []
+
+class MicroZedZ020Platform(XilinxPlatform):
+    device     = "xc7z020"
+    package    = "clg400"
+    speed      = "1"
+    resources  = []
     connectors = [
         Connector("JX1", 0,
             "F9  J6  "
diff --git a/amaranth_boards/nexys4ddr.py b/amaranth_boards/nexys4ddr.py
index b4e6a79..cfd494d 100644
--- a/amaranth_boards/nexys4ddr.py
+++ b/amaranth_boards/nexys4ddr.py
@@ -2,14 +2,14 @@ import os
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx_7series import *
+from amaranth.vendor.xilinx import *
 from .resources import *
 
 
 __all__ = ["Nexys4DDRPlatform"]
 
 
-class Nexys4DDRPlatform(Xilinx7SeriesPlatform):
+class Nexys4DDRPlatform(XilinxPlatform):
     device      = "xc7a100t"
     package     = "csg324"
     speed       = "1"
diff --git a/amaranth_boards/numato_mimas.py b/amaranth_boards/numato_mimas.py
index a3f8930..d088574 100644
--- a/amaranth_boards/numato_mimas.py
+++ b/amaranth_boards/numato_mimas.py
@@ -2,14 +2,14 @@ import os
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx_spartan_3_6 import *
+from amaranth.vendor.xilinx import *
 from .resources import *
 
 
 __all__ = ["NumatoMimasPlatform"]
 
 
-class NumatoMimasPlatform(XilinxSpartan6Platform):
+class NumatoMimasPlatform(XilinxPlatform):
     device      = "xc6slx9"
     package     = "tqg144"
     speed       = "2"
diff --git a/amaranth_boards/sk_xc6slx9.py b/amaranth_boards/sk_xc6slx9.py
index 7e77314..8cb2010 100644
--- a/amaranth_boards/sk_xc6slx9.py
+++ b/amaranth_boards/sk_xc6slx9.py
@@ -2,14 +2,14 @@ import os
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx_spartan_3_6 import *
+from amaranth.vendor.xilinx import *
 from .resources import *
 
 
 __all__ = ["SK_XC6SLX9Platform"]
 
 
-class SK_XC6SLX9Platform(XilinxSpartan6Platform):
+class SK_XC6SLX9Platform(XilinxPlatform):
     device      = "xc6slx9"
     package     = "tqg144"
     speed       = "2"
diff --git a/amaranth_boards/te0714_03_50_2I.py b/amaranth_boards/te0714_03_50_2I.py
index c7c015c..5bafacf 100644
--- a/amaranth_boards/te0714_03_50_2I.py
+++ b/amaranth_boards/te0714_03_50_2I.py
@@ -1,12 +1,12 @@
 from amaranth.build import *
-from amaranth.vendor.xilinx_7series import *
+from amaranth.vendor.xilinx import *
 from .resources import *
 
 
 __all__ = ["TE0714_03_50_2IPlatform"]
 
 
-class TE0714_03_50_2IPlatform(Xilinx7SeriesPlatform):
+class TE0714_03_50_2IPlatform(XilinxPlatform):
     device      = "xc7a50t"
     package     = "csg325"
     speed       = "2"
diff --git a/amaranth_boards/tinyfpga_ax1.py b/amaranth_boards/tinyfpga_ax1.py
index 7c76768..379c577 100644
--- a/amaranth_boards/tinyfpga_ax1.py
+++ b/amaranth_boards/tinyfpga_ax1.py
@@ -1,5 +1,5 @@
 from amaranth.build import *
-from amaranth.vendor.lattice_machxo2 import *
+from amaranth.vendor.lattice_machxo_2_3l import *
 from .resources import *
 
 
diff --git a/amaranth_boards/tinyfpga_ax2.py b/amaranth_boards/tinyfpga_ax2.py
index 3e9e989..344474f 100644
--- a/amaranth_boards/tinyfpga_ax2.py
+++ b/amaranth_boards/tinyfpga_ax2.py
@@ -1,5 +1,5 @@
 from amaranth.build import *
-from amaranth.vendor.lattice_machxo2 import *
+from amaranth.vendor.lattice_machxo_2_3l import *
 from .resources import *
 
 
diff --git a/amaranth_boards/zturn_lite_z007s.py b/amaranth_boards/zturn_lite_z007s.py
index f732f9f..cdaf958 100644
--- a/amaranth_boards/zturn_lite_z007s.py
+++ b/amaranth_boards/zturn_lite_z007s.py
@@ -1,11 +1,11 @@
 from amaranth.build import *
-from amaranth.vendor.xilinx_7series import *
+from amaranth.vendor.xilinx import *
 
 
 __all__ = ["ZTurnLiteZ007SPlatform"]
 
 
-class ZTurnLiteZ007SPlatform(Xilinx7SeriesPlatform):
+class ZTurnLiteZ007SPlatform(XilinxPlatform):
     device     = "xc7z007s"
     package    = "clg400"
     speed      = "1"