From 170675812b71ee722bcf8ccdb88409a9ad97ffe2 Mon Sep 17 00:00:00 2001 From: Wanda Date: Wed, 13 Dec 2023 15:31:33 +0100 Subject: Bump to amaranth 0.4. --- 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 +- 60 files changed, 60 insertions(+), 60 deletions(-) (limited to 'amaranth_boards') diff --git a/amaranth_boards/alchitry_au.py b/amaranth_boards/alchitry_au.py index bcc637d..87b98cf 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 import * +from amaranth.vendor import XilinxPlatform from .resources import * diff --git a/amaranth_boards/arrow_deca.py b/amaranth_boards/arrow_deca.py index 5fd4245..704bbe0 100644 --- a/amaranth_boards/arrow_deca.py +++ b/amaranth_boards/arrow_deca.py @@ -2,7 +2,7 @@ import os 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 e15b85c..3714b59 100644 --- a/amaranth_boards/arty_a7.py +++ b/amaranth_boards/arty_a7.py @@ -2,7 +2,7 @@ import os 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 9c01fbc..5366cdc 100644 --- a/amaranth_boards/arty_s7.py +++ b/amaranth_boards/arty_s7.py @@ -3,7 +3,7 @@ import textwrap 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 d4ac9ad..572c1d8 100644 --- a/amaranth_boards/arty_z7.py +++ b/amaranth_boards/arty_z7.py @@ -2,7 +2,7 @@ import os 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 64b106e..92e974e 100644 --- a/amaranth_boards/atlys.py +++ b/amaranth_boards/atlys.py @@ -2,7 +2,7 @@ import subprocess 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 1e2db73..2355816 100644 --- a/amaranth_boards/blackice.py +++ b/amaranth_boards/blackice.py @@ -2,7 +2,7 @@ import os 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 cbaab98..a466708 100644 --- a/amaranth_boards/blackice_ii.py +++ b/amaranth_boards/blackice_ii.py @@ -2,7 +2,7 @@ import os 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 412e7ed..9633463 100644 --- a/amaranth_boards/chameleon96.py +++ b/amaranth_boards/chameleon96.py @@ -3,7 +3,7 @@ import subprocess 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 f4f5d7c..712ab41 100644 --- a/amaranth_boards/cmod_a7.py +++ b/amaranth_boards/cmod_a7.py @@ -2,7 +2,7 @@ import os 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 8090ef6..ba916c4 100644 --- a/amaranth_boards/cmod_s7.py +++ b/amaranth_boards/cmod_s7.py @@ -2,7 +2,7 @@ import os 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 5ade245..ceeefcb 100644 --- a/amaranth_boards/colorlight_5a75b_r7_0.py +++ b/amaranth_boards/colorlight_5a75b_r7_0.py @@ -2,7 +2,7 @@ import os 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 c10cce3..9cc84a7 100644 --- a/amaranth_boards/de0.py +++ b/amaranth_boards/de0.py @@ -2,7 +2,7 @@ import os 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 adc607f..8df7dd9 100644 --- a/amaranth_boards/de0_cv.py +++ b/amaranth_boards/de0_cv.py @@ -2,7 +2,7 @@ import os 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 de9ea84..3c0664f 100644 --- a/amaranth_boards/de10_lite.py +++ b/amaranth_boards/de10_lite.py @@ -2,7 +2,7 @@ import os 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 d23cbe1..41800ab 100644 --- a/amaranth_boards/de10_nano.py +++ b/amaranth_boards/de10_nano.py @@ -2,7 +2,7 @@ import os 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 8df8c46..70e6c09 100644 --- a/amaranth_boards/de1_soc.py +++ b/amaranth_boards/de1_soc.py @@ -2,7 +2,7 @@ import os 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 b51eed4..f176ef1 100644 --- a/amaranth_boards/ebaz4205.py +++ b/amaranth_boards/ebaz4205.py @@ -2,7 +2,7 @@ import os 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 3eb6189..705939d 100644 --- a/amaranth_boards/ecp5_5g_evn.py +++ b/amaranth_boards/ecp5_5g_evn.py @@ -2,7 +2,7 @@ import os 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 9437dc1..c23a3a5 100644 --- a/amaranth_boards/ecpix5.py +++ b/amaranth_boards/ecpix5.py @@ -2,7 +2,7 @@ import os 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 14fa8fc..326956d 100644 --- a/amaranth_boards/fomu_hacker.py +++ b/amaranth_boards/fomu_hacker.py @@ -2,7 +2,7 @@ import os 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 ef27dbd..70db867 100644 --- a/amaranth_boards/fomu_pvt.py +++ b/amaranth_boards/fomu_pvt.py @@ -2,7 +2,7 @@ import os 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 f07107f..d17f5cf 100644 --- a/amaranth_boards/genesys2.py +++ b/amaranth_boards/genesys2.py @@ -2,7 +2,7 @@ import os 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 5b61fb6..bf00b6e 100644 --- a/amaranth_boards/ice40_hx1k_blink_evn.py +++ b/amaranth_boards/ice40_hx1k_blink_evn.py @@ -2,7 +2,7 @@ import os 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 da24c29..fa40c31 100644 --- a/amaranth_boards/ice40_hx8k_b_evn.py +++ b/amaranth_boards/ice40_hx8k_b_evn.py @@ -2,7 +2,7 @@ import os 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 10a100b..a4e4d7d 100644 --- a/amaranth_boards/ice40_up5k_b_evn.py +++ b/amaranth_boards/ice40_up5k_b_evn.py @@ -2,7 +2,7 @@ import os 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 687ea16..0589799 100644 --- a/amaranth_boards/icebreaker.py +++ b/amaranth_boards/icebreaker.py @@ -2,7 +2,7 @@ import os 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 3d25236..8715206 100644 --- a/amaranth_boards/icebreaker_bitsy.py +++ b/amaranth_boards/icebreaker_bitsy.py @@ -2,7 +2,7 @@ import os 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 453d84f..3ae563e 100644 --- a/amaranth_boards/icestick.py +++ b/amaranth_boards/icestick.py @@ -2,7 +2,7 @@ import os 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 d78c398..2c026bb 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 1f2b07b..7c91e3e 100644 --- a/amaranth_boards/icesugar_nano.py +++ b/amaranth_boards/icesugar_nano.py @@ -2,7 +2,7 @@ import os 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 8bc6452..822ba35 100644 --- a/amaranth_boards/kc705.py +++ b/amaranth_boards/kc705.py @@ -2,7 +2,7 @@ import os 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 15072db..f353838 100644 --- a/amaranth_boards/kcu105.py +++ b/amaranth_boards/kcu105.py @@ -2,7 +2,7 @@ import os 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 acc131c..1be77ff 100644 --- a/amaranth_boards/logicbone.py +++ b/amaranth_boards/logicbone.py @@ -2,7 +2,7 @@ import os 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 d4bba2b..4baa3e5 100644 --- a/amaranth_boards/machxo3_sk.py +++ b/amaranth_boards/machxo3_sk.py @@ -2,7 +2,7 @@ import os 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 b45cedc..7bfe5e1 100644 --- a/amaranth_boards/mercury.py +++ b/amaranth_boards/mercury.py @@ -2,7 +2,7 @@ import os 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 727bf69..661a4a6 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 3f7badd..66d848b 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 1ccb683..86fcd0c 100644 --- a/amaranth_boards/mister.py +++ b/amaranth_boards/mister.py @@ -2,7 +2,7 @@ import os 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 d5c970a..d21746a 100644 --- a/amaranth_boards/nandland_go.py +++ b/amaranth_boards/nandland_go.py @@ -2,7 +2,7 @@ import os 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 cfd494d..b9f2d1f 100644 --- a/amaranth_boards/nexys4ddr.py +++ b/amaranth_boards/nexys4ddr.py @@ -2,7 +2,7 @@ import os 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 d088574..5486c03 100644 --- a/amaranth_boards/numato_mimas.py +++ b/amaranth_boards/numato_mimas.py @@ -2,7 +2,7 @@ import os 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 2316461..1d5c355 100644 --- a/amaranth_boards/orangecrab_r0_1.py +++ b/amaranth_boards/orangecrab_r0_1.py @@ -3,7 +3,7 @@ import subprocess 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 6654f38..2056c7b 100644 --- a/amaranth_boards/orangecrab_r0_2.py +++ b/amaranth_boards/orangecrab_r0_2.py @@ -3,7 +3,7 @@ import subprocess 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 26ef4dd..8547620 100644 --- a/amaranth_boards/quickfeather.py +++ b/amaranth_boards/quickfeather.py @@ -3,7 +3,7 @@ import sys 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 8c313ef..01ee210 100644 --- a/amaranth_boards/rz_easyfpga_a2_2.py +++ b/amaranth_boards/rz_easyfpga_a2_2.py @@ -2,7 +2,7 @@ import os 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 8cb2010..24ffd21 100644 --- a/amaranth_boards/sk_xc6slx9.py +++ b/amaranth_boards/sk_xc6slx9.py @@ -2,7 +2,7 @@ import os 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 c6aab63..67f2f31 100644 --- a/amaranth_boards/supercon19badge.py +++ b/amaranth_boards/supercon19badge.py @@ -2,7 +2,7 @@ import os 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 f604b51..957a3c0 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 ab9ad2e..e049355 100644 --- a/amaranth_boards/tang_nano_9k.py +++ b/amaranth_boards/tang_nano_9k.py @@ -2,7 +2,7 @@ import os 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 5bafacf..24e58ee 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 379c577..f31fd22 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 344474f..161d322 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 b8ce12f..ef679d3 100644 --- a/amaranth_boards/tinyfpga_bx.py +++ b/amaranth_boards/tinyfpga_bx.py @@ -2,7 +2,7 @@ import os 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 cb34171..ee84909 100644 --- a/amaranth_boards/ulx3s.py +++ b/amaranth_boards/ulx3s.py @@ -4,7 +4,7 @@ import subprocess 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 3089e78..61d6188 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 b6be916..db58fe2 100644 --- a/amaranth_boards/upduino_v2.py +++ b/amaranth_boards/upduino_v2.py @@ -2,7 +2,7 @@ import os 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 560844a..6aab3ea 100644 --- a/amaranth_boards/upduino_v3.py +++ b/amaranth_boards/upduino_v3.py @@ -2,7 +2,7 @@ import os 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 a7467a3..df6a5c8 100644 --- a/amaranth_boards/versa_ecp5.py +++ b/amaranth_boards/versa_ecp5.py @@ -2,7 +2,7 @@ import os 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 cdaf958..6401db9 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"] -- cgit v1.2.3