Merge remote-tracking branch 'origin/main' into bump-verilator

2023-05-09 13:27:13 -07:00
parent d4dcbe3297 8b805aca1b
commit 2997cddc0e
177 changed files with 4248 additions and 2194 deletions
--- a/conda-reqs/chipyard.yaml
+++ b/conda-reqs/chipyard.yaml
@@ -1,7 +1,7 @@
 channels:
    - ucb-bar
-    - litex-hub
    - conda-forge
+    - litex-hub
    - nodefaults

 platforms:
@@ -103,7 +103,7 @@ dependencies:
    - sty
    - open_pdks.sky130a
    - pip:
-        - hammer-vlsi[asap7]==1.0.5
+        - hammer-vlsi[asap7]==1.1.1

    # doc requirements
    - sphinx
--- a/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml
+++ b/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml
--- a/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml
+++ b/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml
--- a/conda-reqs/esp-tools.yaml
+++ b/conda-reqs/esp-tools.yaml
@@ -1,7 +1,7 @@
 channels:
    - ucb-bar
-    - litex-hub
    - conda-forge
+    - litex-hub
    - nodefaults

 platforms:
--- a/conda-reqs/riscv-tools.yaml
+++ b/conda-reqs/riscv-tools.yaml
@@ -1,7 +1,7 @@
 channels:
    - ucb-bar
-    - litex-hub
    - conda-forge
+    - litex-hub
    - nodefaults

 platforms: