From 73288e595d0dd76297d2f3846fc91d7aeb10f27a Mon Sep 17 00:00:00 2001
From: Wanda <wanda@phinode.net>
Date: Wed, 13 Dec 2023 15:31:33 +0100
Subject: [PATCH] Bump to amaranth 0.4.

---
 .github/workflows/main.yml               | 6 +++---
 amaranth_boards/alchitry_au.py           | 2 +-
 amaranth_boards/arrow_deca.py            | 2 +-
 amaranth_boards/arty_a7.py               | 2 +-
 amaranth_boards/arty_s7.py               | 2 +-
 amaranth_boards/arty_z7.py               | 2 +-
 amaranth_boards/atlys.py                 | 2 +-
 amaranth_boards/blackice.py              | 2 +-
 amaranth_boards/blackice_ii.py           | 2 +-
 amaranth_boards/chameleon96.py           | 2 +-
 amaranth_boards/cmod_a7.py               | 2 +-
 amaranth_boards/cmod_s7.py               | 2 +-
 amaranth_boards/colorlight_5a75b_r7_0.py | 2 +-
 amaranth_boards/de0.py                   | 2 +-
 amaranth_boards/de0_cv.py                | 2 +-
 amaranth_boards/de10_lite.py             | 2 +-
 amaranth_boards/de10_nano.py             | 2 +-
 amaranth_boards/de1_soc.py               | 2 +-
 amaranth_boards/ebaz4205.py              | 2 +-
 amaranth_boards/ecp5_5g_evn.py           | 2 +-
 amaranth_boards/ecpix5.py                | 2 +-
 amaranth_boards/fomu_hacker.py           | 2 +-
 amaranth_boards/fomu_pvt.py              | 2 +-
 amaranth_boards/genesys2.py              | 2 +-
 amaranth_boards/ice40_hx1k_blink_evn.py  | 2 +-
 amaranth_boards/ice40_hx8k_b_evn.py      | 2 +-
 amaranth_boards/ice40_up5k_b_evn.py      | 2 +-
 amaranth_boards/icebreaker.py            | 2 +-
 amaranth_boards/icebreaker_bitsy.py      | 2 +-
 amaranth_boards/icestick.py              | 2 +-
 amaranth_boards/icesugar.py              | 2 +-
 amaranth_boards/icesugar_nano.py         | 2 +-
 amaranth_boards/kc705.py                 | 2 +-
 amaranth_boards/kcu105.py                | 2 +-
 amaranth_boards/logicbone.py             | 2 +-
 amaranth_boards/machxo3_sk.py            | 2 +-
 amaranth_boards/mercury.py               | 2 +-
 amaranth_boards/microzed_z010.py         | 2 +-
 amaranth_boards/microzed_z020.py         | 2 +-
 amaranth_boards/mister.py                | 2 +-
 amaranth_boards/nandland_go.py           | 2 +-
 amaranth_boards/nexys4ddr.py             | 2 +-
 amaranth_boards/numato_mimas.py          | 2 +-
 amaranth_boards/orangecrab_r0_1.py       | 2 +-
 amaranth_boards/orangecrab_r0_2.py       | 2 +-
 amaranth_boards/quickfeather.py          | 2 +-
 amaranth_boards/rz_easyfpga_a2_2.py      | 2 +-
 amaranth_boards/sk_xc6slx9.py            | 2 +-
 amaranth_boards/supercon19badge.py       | 2 +-
 amaranth_boards/tang_nano.py             | 2 +-
 amaranth_boards/tang_nano_9k.py          | 2 +-
 amaranth_boards/te0714_03_50_2I.py       | 2 +-
 amaranth_boards/tinyfpga_ax1.py          | 2 +-
 amaranth_boards/tinyfpga_ax2.py          | 2 +-
 amaranth_boards/tinyfpga_bx.py           | 2 +-
 amaranth_boards/ulx3s.py                 | 2 +-
 amaranth_boards/upduino_v1.py            | 2 +-
 amaranth_boards/upduino_v2.py            | 2 +-
 amaranth_boards/upduino_v3.py            | 2 +-
 amaranth_boards/versa_ecp5.py            | 2 +-
 amaranth_boards/zturn_lite_z007s.py      | 2 +-
 pyproject.toml                           | 2 +-
 62 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 04a871ef..3b9583a1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,13 +20,13 @@ jobs:
         - 'pypy-3.9'
         # this version range needs to be synchronized with the one in pyproject.toml
         amaranth-version:
-        - '0.3'
+        - '0.4'
         - 'git'
         allow-failure:
         - true
         - false
         exclude: # all of these are inverted (this is unfortunately the best way to do this)
-        - amaranth-version: '0.3'
+        - amaranth-version: '0.4'
           allow-failure: false
         - amaranth-version: 'git'
           allow-failure: true
@@ -44,7 +44,7 @@ jobs:
         run: |
           pip install 'amaranth==${{ matrix.amaranth-version }}'
       - name: Downgrade MarkupSafe
-        if: ${{ matrix.amaranth-version == '0.3' }}
+        if: ${{ matrix.amaranth-version == '0.4' }}
         run: |
           pip install 'MarkupSafe==2.0.1'
       - name: Install Amaranth from git
diff --git a/amaranth_boards/alchitry_au.py b/amaranth_boards/alchitry_au.py
index bcc637d0..87b98cfc 100644
--- a/amaranth_boards/alchitry_au.py
+++ b/amaranth_boards/alchitry_au.py
@@ -3,7 +3,7 @@
 import shutil
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/arrow_deca.py b/amaranth_boards/arrow_deca.py
index 5fd42450..704bbe00 100644
--- a/amaranth_boards/arrow_deca.py
+++ b/amaranth_boards/arrow_deca.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.intel import *
+from amaranth.vendor import IntelPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/arty_a7.py b/amaranth_boards/arty_a7.py
index e15b85ce..3714b59f 100644
--- a/amaranth_boards/arty_a7.py
+++ b/amaranth_boards/arty_a7.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/arty_s7.py b/amaranth_boards/arty_s7.py
index 9c01fbc8..5366cdce 100644
--- a/amaranth_boards/arty_s7.py
+++ b/amaranth_boards/arty_s7.py
@@ -3,7 +3,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/arty_z7.py b/amaranth_boards/arty_z7.py
index d4ac9ada..572c1d8b 100644
--- a/amaranth_boards/arty_z7.py
+++ b/amaranth_boards/arty_z7.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/atlys.py b/amaranth_boards/atlys.py
index 64b106e3..92e974e8 100644
--- a/amaranth_boards/atlys.py
+++ b/amaranth_boards/atlys.py
@@ -2,7 +2,7 @@
 import textwrap
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/blackice.py b/amaranth_boards/blackice.py
index 1e2db73c..23558169 100644
--- a/amaranth_boards/blackice.py
+++ b/amaranth_boards/blackice.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/blackice_ii.py b/amaranth_boards/blackice_ii.py
index cbaab98f..a466708f 100644
--- a/amaranth_boards/blackice_ii.py
+++ b/amaranth_boards/blackice_ii.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/chameleon96.py b/amaranth_boards/chameleon96.py
index 412e7ed8..96334638 100644
--- a/amaranth_boards/chameleon96.py
+++ b/amaranth_boards/chameleon96.py
@@ -3,7 +3,7 @@
 
 from amaranth import *
 from amaranth.build import *
-from amaranth.vendor.intel import *
+from amaranth.vendor import IntelPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/cmod_a7.py b/amaranth_boards/cmod_a7.py
index f4f5d7cd..712ab41e 100644
--- a/amaranth_boards/cmod_a7.py
+++ b/amaranth_boards/cmod_a7.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 """
diff --git a/amaranth_boards/cmod_s7.py b/amaranth_boards/cmod_s7.py
index 8090ef67..ba916c42 100644
--- a/amaranth_boards/cmod_s7.py
+++ b/amaranth_boards/cmod_s7.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 """
diff --git a/amaranth_boards/colorlight_5a75b_r7_0.py b/amaranth_boards/colorlight_5a75b_r7_0.py
index 5ade2456..ceeefcbf 100644
--- a/amaranth_boards/colorlight_5a75b_r7_0.py
+++ b/amaranth_boards/colorlight_5a75b_r7_0.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ecp5 import *
+from amaranth.vendor import LatticeECP5Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/de0.py b/amaranth_boards/de0.py
index c10cce30..9cc84a75 100644
--- a/amaranth_boards/de0.py
+++ b/amaranth_boards/de0.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.intel import *
+from amaranth.vendor import IntelPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/de0_cv.py b/amaranth_boards/de0_cv.py
index adc607fd..8df7dd98 100644
--- a/amaranth_boards/de0_cv.py
+++ b/amaranth_boards/de0_cv.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.intel import *
+from amaranth.vendor import IntelPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/de10_lite.py b/amaranth_boards/de10_lite.py
index de9ea84e..3c0664f2 100644
--- a/amaranth_boards/de10_lite.py
+++ b/amaranth_boards/de10_lite.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.intel import *
+from amaranth.vendor import IntelPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/de10_nano.py b/amaranth_boards/de10_nano.py
index d23cbe12..41800ab0 100644
--- a/amaranth_boards/de10_nano.py
+++ b/amaranth_boards/de10_nano.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.intel import *
+from amaranth.vendor import IntelPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/de1_soc.py b/amaranth_boards/de1_soc.py
index 8df8c46f..70e6c09f 100644
--- a/amaranth_boards/de1_soc.py
+++ b/amaranth_boards/de1_soc.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.intel import *
+from amaranth.vendor import IntelPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/ebaz4205.py b/amaranth_boards/ebaz4205.py
index b51eed4f..f176ef16 100644
--- a/amaranth_boards/ebaz4205.py
+++ b/amaranth_boards/ebaz4205.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/ecp5_5g_evn.py b/amaranth_boards/ecp5_5g_evn.py
index 3eb6189d..705939dc 100644
--- a/amaranth_boards/ecp5_5g_evn.py
+++ b/amaranth_boards/ecp5_5g_evn.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ecp5 import *
+from amaranth.vendor import LatticeECP5Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/ecpix5.py b/amaranth_boards/ecpix5.py
index 9437dc1e..c23a3a54 100644
--- a/amaranth_boards/ecpix5.py
+++ b/amaranth_boards/ecpix5.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ecp5 import *
+from amaranth.vendor import LatticeECP5Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/fomu_hacker.py b/amaranth_boards/fomu_hacker.py
index 14fa8fc3..326956d4 100644
--- a/amaranth_boards/fomu_hacker.py
+++ b/amaranth_boards/fomu_hacker.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/fomu_pvt.py b/amaranth_boards/fomu_pvt.py
index ef27dbdb..70db867c 100644
--- a/amaranth_boards/fomu_pvt.py
+++ b/amaranth_boards/fomu_pvt.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/genesys2.py b/amaranth_boards/genesys2.py
index f07107fb..d17f5cfa 100644
--- a/amaranth_boards/genesys2.py
+++ b/amaranth_boards/genesys2.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/ice40_hx1k_blink_evn.py b/amaranth_boards/ice40_hx1k_blink_evn.py
index 5b61fb60..bf00b6e8 100644
--- a/amaranth_boards/ice40_hx1k_blink_evn.py
+++ b/amaranth_boards/ice40_hx1k_blink_evn.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/ice40_hx8k_b_evn.py b/amaranth_boards/ice40_hx8k_b_evn.py
index da24c290..fa40c31d 100644
--- a/amaranth_boards/ice40_hx8k_b_evn.py
+++ b/amaranth_boards/ice40_hx8k_b_evn.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/ice40_up5k_b_evn.py b/amaranth_boards/ice40_up5k_b_evn.py
index 10a100bd..a4e4d7d5 100644
--- a/amaranth_boards/ice40_up5k_b_evn.py
+++ b/amaranth_boards/ice40_up5k_b_evn.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/icebreaker.py b/amaranth_boards/icebreaker.py
index 687ea161..05897993 100644
--- a/amaranth_boards/icebreaker.py
+++ b/amaranth_boards/icebreaker.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/icebreaker_bitsy.py b/amaranth_boards/icebreaker_bitsy.py
index 3d252366..8715206a 100644
--- a/amaranth_boards/icebreaker_bitsy.py
+++ b/amaranth_boards/icebreaker_bitsy.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/icestick.py b/amaranth_boards/icestick.py
index 453d84fe..3ae563ec 100644
--- a/amaranth_boards/icestick.py
+++ b/amaranth_boards/icestick.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/icesugar.py b/amaranth_boards/icesugar.py
index d78c3987..2c026bb6 100644
--- a/amaranth_boards/icesugar.py
+++ b/amaranth_boards/icesugar.py
@@ -1,7 +1,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/icesugar_nano.py b/amaranth_boards/icesugar_nano.py
index 1f2b07bb..7c91e3e4 100644
--- a/amaranth_boards/icesugar_nano.py
+++ b/amaranth_boards/icesugar_nano.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/kc705.py b/amaranth_boards/kc705.py
index 8bc64520..822ba357 100644
--- a/amaranth_boards/kc705.py
+++ b/amaranth_boards/kc705.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/kcu105.py b/amaranth_boards/kcu105.py
index 15072db0..f3538386 100644
--- a/amaranth_boards/kcu105.py
+++ b/amaranth_boards/kcu105.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/logicbone.py b/amaranth_boards/logicbone.py
index acc131cf..1be77ff1 100644
--- a/amaranth_boards/logicbone.py
+++ b/amaranth_boards/logicbone.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ecp5 import *
+from amaranth.vendor import LatticeECP5Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/machxo3_sk.py b/amaranth_boards/machxo3_sk.py
index d4bba2ba..4baa3e54 100644
--- a/amaranth_boards/machxo3_sk.py
+++ b/amaranth_boards/machxo3_sk.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_machxo_2_3l import *
+from amaranth.vendor import LatticeMachXO3LPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/mercury.py b/amaranth_boards/mercury.py
index b45cedcd..7bfe5e1a 100644
--- a/amaranth_boards/mercury.py
+++ b/amaranth_boards/mercury.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/microzed_z010.py b/amaranth_boards/microzed_z010.py
index 727bf699..661a4a62 100644
--- a/amaranth_boards/microzed_z010.py
+++ b/amaranth_boards/microzed_z010.py
@@ -1,5 +1,5 @@
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 
 
 __all__ = ["MicroZedZ010Platform"]
diff --git a/amaranth_boards/microzed_z020.py b/amaranth_boards/microzed_z020.py
index 3f7badd0..66d848b2 100644
--- a/amaranth_boards/microzed_z020.py
+++ b/amaranth_boards/microzed_z020.py
@@ -1,5 +1,5 @@
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 
 
 __all__ = ["MicroZedZ020Platform"]
diff --git a/amaranth_boards/mister.py b/amaranth_boards/mister.py
index 1ccb683c..86fcd0c2 100644
--- a/amaranth_boards/mister.py
+++ b/amaranth_boards/mister.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.intel import *
+from amaranth.vendor import IntelPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/nandland_go.py b/amaranth_boards/nandland_go.py
index d5c970ad..d21746af 100644
--- a/amaranth_boards/nandland_go.py
+++ b/amaranth_boards/nandland_go.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/nexys4ddr.py b/amaranth_boards/nexys4ddr.py
index cfd494d8..b9f2d1fa 100644
--- a/amaranth_boards/nexys4ddr.py
+++ b/amaranth_boards/nexys4ddr.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/numato_mimas.py b/amaranth_boards/numato_mimas.py
index d0885743..5486c032 100644
--- a/amaranth_boards/numato_mimas.py
+++ b/amaranth_boards/numato_mimas.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/orangecrab_r0_1.py b/amaranth_boards/orangecrab_r0_1.py
index 2316461b..1d5c3552 100644
--- a/amaranth_boards/orangecrab_r0_1.py
+++ b/amaranth_boards/orangecrab_r0_1.py
@@ -3,7 +3,7 @@
 import shutil
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ecp5 import *
+from amaranth.vendor import LatticeECP5Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/orangecrab_r0_2.py b/amaranth_boards/orangecrab_r0_2.py
index 6654f38f..2056c7b5 100644
--- a/amaranth_boards/orangecrab_r0_2.py
+++ b/amaranth_boards/orangecrab_r0_2.py
@@ -3,7 +3,7 @@
 import shutil
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ecp5 import *
+from amaranth.vendor import LatticeECP5Platform
 from .resources import *
 
 # NOTE: Keep OrangeCrabR0_2Platform for backwards compatibility
diff --git a/amaranth_boards/quickfeather.py b/amaranth_boards/quickfeather.py
index 26ef4ddc..8547620f 100644
--- a/amaranth_boards/quickfeather.py
+++ b/amaranth_boards/quickfeather.py
@@ -3,7 +3,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.quicklogic import *
+from amaranth.vendor import QuicklogicPlatform
 from amaranth_boards.resources import *
 
 
diff --git a/amaranth_boards/rz_easyfpga_a2_2.py b/amaranth_boards/rz_easyfpga_a2_2.py
index 8c313ef6..01ee2107 100644
--- a/amaranth_boards/rz_easyfpga_a2_2.py
+++ b/amaranth_boards/rz_easyfpga_a2_2.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.intel import *
+from amaranth.vendor import IntelPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/sk_xc6slx9.py b/amaranth_boards/sk_xc6slx9.py
index 8cb2010b..24ffd217 100644
--- a/amaranth_boards/sk_xc6slx9.py
+++ b/amaranth_boards/sk_xc6slx9.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/supercon19badge.py b/amaranth_boards/supercon19badge.py
index c6aab63a..67f2f315 100644
--- a/amaranth_boards/supercon19badge.py
+++ b/amaranth_boards/supercon19badge.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ecp5 import *
+from amaranth.vendor import LatticeECP5Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/tang_nano.py b/amaranth_boards/tang_nano.py
index f604b515..957a3c06 100644
--- a/amaranth_boards/tang_nano.py
+++ b/amaranth_boards/tang_nano.py
@@ -1,5 +1,5 @@
 import subprocess
-from amaranth.vendor.gowin import GowinPlatform
+from amaranth.vendor import GowinPlatform
 from amaranth.build import *
 from .resources import *
 
diff --git a/amaranth_boards/tang_nano_9k.py b/amaranth_boards/tang_nano_9k.py
index ab9ad2ef..e0493553 100644
--- a/amaranth_boards/tang_nano_9k.py
+++ b/amaranth_boards/tang_nano_9k.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.gowin import *
+from amaranth.vendor import GowinPlatform
 
 from .resources import *
 
diff --git a/amaranth_boards/te0714_03_50_2I.py b/amaranth_boards/te0714_03_50_2I.py
index 5bafacf7..24e58ee8 100644
--- a/amaranth_boards/te0714_03_50_2I.py
+++ b/amaranth_boards/te0714_03_50_2I.py
@@ -1,5 +1,5 @@
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 from .resources import *
 
 
diff --git a/amaranth_boards/tinyfpga_ax1.py b/amaranth_boards/tinyfpga_ax1.py
index 379c5776..f31fd229 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_machxo_2_3l import *
+from amaranth.vendor import LatticeMachXO2Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/tinyfpga_ax2.py b/amaranth_boards/tinyfpga_ax2.py
index 344474f9..161d322a 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_machxo_2_3l import *
+from amaranth.vendor import LatticeMachXO2Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/tinyfpga_bx.py b/amaranth_boards/tinyfpga_bx.py
index b8ce12f9..ef679d3a 100644
--- a/amaranth_boards/tinyfpga_bx.py
+++ b/amaranth_boards/tinyfpga_bx.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/ulx3s.py b/amaranth_boards/ulx3s.py
index cb34171f..ee849094 100644
--- a/amaranth_boards/ulx3s.py
+++ b/amaranth_boards/ulx3s.py
@@ -4,7 +4,7 @@
 import shutil
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ecp5 import *
+from amaranth.vendor import LatticeECP5Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/upduino_v1.py b/amaranth_boards/upduino_v1.py
index 3089e784..61d61888 100644
--- a/amaranth_boards/upduino_v1.py
+++ b/amaranth_boards/upduino_v1.py
@@ -1,5 +1,5 @@
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/upduino_v2.py b/amaranth_boards/upduino_v2.py
index b6be9162..db58fe2d 100644
--- a/amaranth_boards/upduino_v2.py
+++ b/amaranth_boards/upduino_v2.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from .resources import *
 from .upduino_v1 import UpduinoV1Platform
 
diff --git a/amaranth_boards/upduino_v3.py b/amaranth_boards/upduino_v3.py
index 560844ad..6aab3eaf 100644
--- a/amaranth_boards/upduino_v3.py
+++ b/amaranth_boards/upduino_v3.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ice40 import *
+from amaranth.vendor import LatticeICE40Platform
 from amaranth_boards.resources import *
 
 
diff --git a/amaranth_boards/versa_ecp5.py b/amaranth_boards/versa_ecp5.py
index a7467a3d..df6a5c85 100644
--- a/amaranth_boards/versa_ecp5.py
+++ b/amaranth_boards/versa_ecp5.py
@@ -2,7 +2,7 @@
 import subprocess
 
 from amaranth.build import *
-from amaranth.vendor.lattice_ecp5 import *
+from amaranth.vendor import LatticeECP5Platform
 from .resources import *
 
 
diff --git a/amaranth_boards/zturn_lite_z007s.py b/amaranth_boards/zturn_lite_z007s.py
index cdaf9587..6401db96 100644
--- a/amaranth_boards/zturn_lite_z007s.py
+++ b/amaranth_boards/zturn_lite_z007s.py
@@ -1,5 +1,5 @@
 from amaranth.build import *
-from amaranth.vendor.xilinx import *
+from amaranth.vendor import XilinxPlatform
 
 
 __all__ = ["ZTurnLiteZ007SPlatform"]
diff --git a/pyproject.toml b/pyproject.toml
index 3aa0a13e..deea48ab 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ license = {file = "LICENSE.txt"}
 requires-python = "~=3.8"
 dependencies = [
   # this version requirement needs to be synchronized with the one in .github/workflows/main.yml
-  "amaranth>=0.3,<0.5",
+  "amaranth>=0.4,<0.5",
 ]
 
 [project.urls]