Merge branch 'main' into cmod_a7_board

Author: whitequark

.git_archival.txt

@@ -0,0 +1,4 @@
+node: $Format:%H$
+node-date: $Format:%cI$
+describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
+ref-names: $Format:%D$

.gitattributes

@@ -0,0 +1 @@
+.git_archival.txt export-subst

.github/workflows/main.yml

@@ -3,14 +3,34 @@ name: CI
 jobs:
   test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version:
+        - '3.7'
+        # this version range needs to be synchronized with the one in pyproject.toml
+        amaranth-version:
+        - '0.3'
+        - 'git'
+      fail-fast: false
     steps:
       - name: Check out source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v2
-      - name: Install dependencies
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Amaranth release
+        if: ${{ matrix.amaranth-version != 'git' }}
         run: |
-          pip install wheel
+          pip install 'amaranth==${{ matrix.amaranth-version }}'
+      - name: Downgrade MarkupSafe
+        if: ${{ matrix.amaranth-version == '0.3' }}
+        run: |
+          pip install 'MarkupSafe==2.0.1'
+      - name: Install Amaranth from git
+        if: ${{ matrix.amaranth-version == 'git' }}
+        run: |
+          pip install git+https://github.com/amaranth-lang/amaranth.git
       - name: Test
         run: |
-          python setup.py test
+          python -m unittest discover -t . -s amaranth_boards -p '*.py'

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (C) 2019-2021 Amaranth HDL contributors
+Copyright (C) 2019-2023 Amaranth HDL contributors
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

amaranth_boards/alchitry_au.py

@@ -3,7 +3,7 @@
 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"

amaranth_boards/arty_a7.py

@@ -2,14 +2,14 @@
 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"

amaranth_boards/arty_s7.py

@@ -3,14 +3,14 @@
 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"

amaranth_boards/arty_z7.py

@@ -2,14 +2,14 @@
 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"

amaranth_boards/atlys.py

@@ -2,14 +2,14 @@
 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"""
 

amaranth_boards/ebaz4205.py

@@ -2,14 +2,14 @@
 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"