Update all

2022-10-09 17:08:18 -07:00
parent e75b107cf3
commit f9b938ad55
10 changed files with 399 additions and 138 deletions
--- a/conda-reqs/chipyard.yaml
+++ b/conda-reqs/chipyard.yaml
@@ -29,6 +29,11 @@ dependencies:
    - binutils

    - dromajo # from ucb-bar channel - https://github.com/riscv-boom/dromajo
+<<<<<<< HEAD:conda-reqs/chipyard.yaml
+=======
+    - esp-tools # from ucb-bar channel - https://github.com/ucb-bar/esp-tools-feedstock
+    - firtool # from ucb-bar channel - https://github.com/ucb-bar/firtool-feedstock
+>>>>>>> 3e131170 (Update all):conda-requirements-esp-tools.yaml

    # firemarshal deps
    - python>=3.8