diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..cc517978
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+conda-requirements-esp-tools-linux-64.conda-lock.yml linguist-generated=true
+conda-requirements-riscv-tools-linux-64.conda-lock.yml linguist-generated=true
diff --git a/build.sbt b/build.sbt
index 5e559893..802dabf6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -60,7 +60,7 @@ def isolateAllTests(tests: Seq[TestDefinition]) = tests map { test =>
   new Group(test.name, Seq(test), SubProcess(options))
 } toSeq
 
-val chiselVersion = "3.5.1"
+val chiselVersion = "3.5.2"
 
 lazy val chiselSettings = Seq(
   libraryDependencies ++= Seq("edu.berkeley.cs" %% "chisel3" % chiselVersion,
diff --git a/conda-requirements-esp-tools-linux-64.conda-lock.yml b/conda-requirements-esp-tools-linux-64.conda-lock.yml
index ab4c4fa0..bdf6ecce 100644
--- a/conda-requirements-esp-tools-linux-64.conda-lock.yml
+++ b/conda-requirements-esp-tools-linux-64.conda-lock.yml
@@ -9,7 +9,7 @@
 # To update a single package to the latest version compatible with the version constraints in the source:
 #     conda-lock lock --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml --update PACKAGE
 # To re-solve the entire environment, e.g. after changing a version constraint in the source file:
-#     conda-lock -f /home/ubuntu/work/cy2/conda-requirements-esp-tools.yaml -f /scratch/abejgonza/chipyard-2/conda-requirements-esp-tools.yaml --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml
+#     conda-lock -f /scratch/buildbot/firesim/target-design/chipyard/conda-requirements-esp-tools.yaml --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml
 metadata:
   channels:
   - url: ucb-bar
@@ -19,12 +19,11 @@ metadata:
   - url: nodefaults
     used_env_vars: []
   content_hash:
-    linux-64: c43c09d14c98ff190a4bf2fbe3542c0211b68b457cb6d1b948e436cdb6deac9b
+    linux-64: 5075908599b7f10581bbf1452b4be082245ad6ac58a589e4d111d2ecd0f96b42
   platforms:
   - linux-64
   sources:
-  - /home/ubuntu/work/cy2/conda-requirements-esp-tools.yaml
-  - /scratch/abejgonza/chipyard-2/conda-requirements-esp-tools.yaml
+  - /scratch/buildbot/firesim/target-design/chipyard/conda-requirements-esp-tools.yaml
 package:
 - category: main
   dependencies: {}
@@ -62,14 +61,14 @@ package:
 - category: main
   dependencies: {}
   hash:
-    md5: 64f6be425cd4897e5df1a9e9ac4dcb86
-    sha256: c0b84c0430c4a81c8f5415b268889880bdb695ef74c952378313929869aaec6d
+    md5: 87c986dab320658abaf3e701406b665c
+    sha256: 26a1a2d9e63440ec3b2a59297d47f7d5b405a3caab61bf93648e1621a46bb05a
   manager: conda
   name: ca-certificates
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2022.6.15.2-ha878542_0.tar.bz2
-  version: 2022.6.15.2
+  url: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2022.9.14-ha878542_0.tar.bz2
+  version: 2022.9.14
 - category: main
   dependencies: {}
   hash:
@@ -318,6 +317,18 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/alsa-lib-1.2.7.2-h166bdaf_0.tar.bz2
   version: 1.2.7.2
+- category: main
+  dependencies:
+    libgcc-ng: '>=9.4.0'
+  hash:
+    md5: 9ff50d162aa3b1c861fa30105bea1932
+    sha256: c5e04d9408a0047bd87156b1853a4ac31cb3a5ccdc52374d89c72cbdabe95002
+  manager: conda
+  name: bc
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/bc-1.07.1-h7f98852_0.tar.bz2
+  version: 1.07.1
 - category: main
   dependencies:
     binutils_impl_linux-64: '>=2.36.1,<2.36.2.0a0'
@@ -479,6 +490,18 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/graphite2-1.3.13-h58526e2_1001.tar.bz2
   version: 1.3.13
+- category: main
+  dependencies:
+    libgcc-ng: '>=10.3.0'
+  hash:
+    md5: 30bd3316aac2d72f498a04b2a49c1050
+    sha256: 9a233d5f734f2a4bed786041a9823b69dad5b6757d84341e9f5c822ec89f083b
+  manager: conda
+  name: gzip
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/gzip-1.12-h166bdaf_0.tar.bz2
+  version: '1.12'
 - category: main
   dependencies:
     libgcc-ng: '>=10.3.0'
@@ -750,16 +773,16 @@ package:
   version: 1.4.18
 - category: main
   dependencies:
-    libgcc-ng: '>=7.3.0'
+    libgcc-ng: '>=7.5.0'
   hash:
-    md5: 17a8703794c6960bc79e9966c1e113ab
-    sha256: 1e29c4ea36409b66719cfce3dd9bb1e6a5b366731a0beffaaa77928e514d54fc
+    md5: 4049ebfd3190b580dffe76daed26155a
+    sha256: 4a5fe7c80bb0de0015328e2d3fc8db1736f528cb1fd53cd0d5527e24269a4f7c
   manager: conda
   name: make
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/make-4.2.1-h14c3975_2004.tar.bz2
-  version: 4.2.1
+  url: https://conda.anaconda.org/conda-forge/linux-64/make-4.3-hd18ef5c_1.tar.bz2
+  version: '4.3'
 - category: main
   dependencies:
     libgcc-ng: '>=10.3.0'
@@ -797,6 +820,18 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/openssl-1.1.1q-h166bdaf_0.tar.bz2
   version: 1.1.1q
+- category: main
+  dependencies:
+    libgcc-ng: '>=9.3.0'
+  hash:
+    md5: 4c1bbbec45149a186b915c67d086ed3b
+    sha256: fc30d1b643c35d82abd294cde6b34f7b9e952856c0386f4f069c3a2b7feb28dd
+  manager: conda
+  name: patch
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/patch-2.7.6-h7f98852_1002.tar.bz2
+  version: 2.7.6
 - category: main
   dependencies:
     libgcc-ng: '>=9.3.0'
@@ -870,6 +905,18 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/unzip-6.0-h7f98852_3.tar.bz2
   version: '6.0'
+- category: main
+  dependencies:
+    libgcc-ng: '>=7.3.0'
+  hash:
+    md5: 2e5f1a8199794b21c9472c1a7f27e21a
+    sha256: a3ee6c02932fbee32babe39fa6bda9f781d6dc17122d2a90e62ff2b6866a5de8
+  manager: conda
+  name: which
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/which-2.21-h516909a_0.tar.bz2
+  version: '2.21'
 - category: main
   dependencies:
     libgcc-ng: '>=9.3.0'
@@ -1014,6 +1061,19 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/yaml-0.2.5-h7f98852_2.tar.bz2
   version: 0.2.5
+- category: main
+  dependencies:
+    libgcc-ng: '>=9.3.0'
+    libiconv: '>=1.16,<1.17.0a0'
+  hash:
+    md5: af46eaa305af6768321779615ed88ac4
+    sha256: 016719d88e6f84af579606cfd5e8d52b9c31c9ad38c54b92fff5d49044ca5673
+  manager: conda
+  name: diffutils
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/diffutils-3.8-ha1f6473_0.tar.bz2
+  version: '3.8'
 - category: main
   dependencies:
     libfdt: '>=1.6.1,<1.7.0a0'
@@ -1112,6 +1172,19 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/libllvm14-14.0.6-he0ac6c6_0.tar.bz2
   version: 14.0.6
+- category: main
+  dependencies:
+    libgcc-ng: '>=12'
+    libzlib: '>=1.2.12,<1.3.0a0'
+  hash:
+    md5: fe3ab1049214fca5620b7b96af1a6a55
+    sha256: de50b620811232548e3913bc1c19b28b17cc782447e9cb5cd8faa0cfbd15e966
+  manager: conda
+  name: libmagic
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/libmagic-5.39-h753d276_1.tar.bz2
+  version: '5.39'
 - category: main
   dependencies:
     c-ares: '>=1.18.1,<2.0a0'
@@ -1134,14 +1207,14 @@ package:
     libgcc-ng: '>=12'
     libzlib: '>=1.2.12,<1.3.0a0'
   hash:
-    md5: 6b611734b73d639c084ac4be2fcd996a
-    sha256: f1c48c6a6c829c481db0ea8f95abdef1d28bf53e6430e882323d3e675e880dd5
+    md5: 575078de1d3a3114b3ce131bd1508d0c
+    sha256: 422a544fbfc8d8bf43de4b2dc5c7c991294ad0e37b37439d8dbf740f07a75437
   manager: conda
   name: libpng
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.37-h753d276_4.tar.bz2
-  version: 1.6.37
+  url: https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.38-h753d276_0.tar.bz2
+  version: 1.6.38
 - category: main
   dependencies:
     libgcc-ng: '>=12'
@@ -1320,6 +1393,19 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/screen-4.8.0-he28a2e2_0.tar.bz2
   version: 4.8.0
+- category: main
+  dependencies:
+    libgcc-ng: '>=9.3.0'
+    libiconv: '>=1.16,<1.17.0a0'
+  hash:
+    md5: 33614741eb453005e0c74e027c325508
+    sha256: 967aa10d9197b2a9753f21cb9e7d729560d90df41eb2fa2a3e2ffcb66891d98b
+  manager: conda
+  name: tar
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/tar-1.34-ha1f6473_0.tar.bz2
+  version: '1.34'
 - category: main
   dependencies:
     libgcc-ng: '>=9.4.0'
@@ -1401,6 +1487,19 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/autoconf-2.69-pl5321hd708f79_11.tar.bz2
   version: '2.69'
+- category: main
+  dependencies:
+    libgcc-ng: '>=10.3.0'
+    readline: '>=8.1,<9.0a0'
+  hash:
+    md5: 54d1a374b75f14ecc58aea8c4236c0c3
+    sha256: 6415903ad8774fc0f1bf5b156ae0b6f9988427a0f14bb35467c5938f05fe8707
+  manager: conda
+  name: bash
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/bash-5.1.16-hd863ed2_0.tar.bz2
+  version: 5.1.16
 - category: main
   dependencies:
     flex: ''
@@ -1440,6 +1539,33 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/expect-5.45.4-h555a92e_0.tar.bz2
   version: 5.45.4
+- category: main
+  dependencies:
+    libgcc-ng: '>=12'
+    libmagic: 5.39 h753d276_1
+    libzlib: '>=1.2.12,<1.3.0a0'
+  hash:
+    md5: a0f7ed92aaa3b6d109e6e2301e502c24
+    sha256: 8c3b26e7241324a4fb8a19966e67af043781e6feb4a7393608e5ebcc84410b62
+  manager: conda
+  name: file
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/file-5.39-h753d276_1.tar.bz2
+  version: '5.39'
+- category: main
+  dependencies:
+    gettext: ''
+    libgcc-ng: '>=9.4.0'
+  hash:
+    md5: 8d0b19bcc4a822e154eaf924483c9edb
+    sha256: 377377897759dc0183ad2db9a3c4472d50d81a74b62ad974f32109900d891743
+  manager: conda
+  name: findutils
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/findutils-4.6.0-h7f98852_1001.tar.bz2
+  version: 4.6.0
 - category: main
   dependencies:
     libgcc-ng: '>=12'
@@ -1767,20 +1893,20 @@ package:
 - category: main
   dependencies:
     jpeg: '>=9e,<10a'
-    libgcc-ng: '>=10.3.0'
-    libglib: '>=2.70.2,<3.0a0'
-    libpng: '>=1.6.37,<1.7.0a0'
-    libtiff: '>=4.3.0,<5.0a0'
-    libzlib: '>=1.2.11,<1.3.0a0'
-    zlib: '>=1.2.11,<1.3.0a0'
+    libgcc-ng: '>=12'
+    libglib: '>=2.72.1,<3.0a0'
+    libpng: '>=1.6.38,<1.7.0a0'
+    libtiff: '>=4.4.0,<5.0a0'
+    libzlib: '>=1.2.12,<1.3.0a0'
+    zlib: '>=1.2.12,<1.3.0a0'
   hash:
-    md5: 908fc30f89e27817d835b45f865536d7
-    sha256: 26e5dffede1e068004e7d060a91e003cdf3d9df859a5dc0c4e4378c746b087d9
+    md5: a61c6312192e7c9de71548a6706a21e6
+    sha256: b7379d19afe924b39e29e47b046f99a4a737f58a210c27d083391c0f8f012aad
   manager: conda
   name: gdk-pixbuf
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.8-hff1cb4f_0.tar.bz2
+  url: https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.8-hff1cb4f_1.tar.bz2
   version: 2.42.8
 - category: main
   dependencies:
@@ -2090,7 +2216,7 @@ package:
     icu: '>=70.1,<71.0a0'
     libgcc-ng: '>=12'
     libglib: '>=2.72.1,<3.0a0'
-    libpng: '>=1.6.37,<1.7.0a0'
+    libpng: '>=1.6.38,<1.7.0a0'
     libxcb: '>=1.13,<1.14.0a0'
     libzlib: '>=1.2.12,<1.3.0a0'
     pixman: '>=0.40.0,<1.0a0'
@@ -2101,26 +2227,26 @@ package:
     xorg-libxrender: ''
     zlib: '>=1.2.12,<1.3.0a0'
   hash:
-    md5: 148e1893454972ac8c595c98c7b8ed5c
-    sha256: 351e8033d931cdedf14dd4fdb34bc3eb38c965d5a7f7a29be13a001d42a1fa4d
+    md5: d1a88f3ed5b52e1024b80d4bcd26a7a0
+    sha256: f062cf56e6e50d3ad4b425ebb3765ca9138c6ebc52e6a42d1377de8bc8d954f6
   manager: conda
   name: cairo
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-ha61ee94_1013.tar.bz2
+  url: https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-ha61ee94_1014.tar.bz2
   version: 1.16.0
 - category: main
   dependencies:
     python: '>=3.7'
   hash:
-    md5: 1bd4c453b6d4e446333f857907b0f465
-    sha256: c09e9ffb10141d82ddecf114aebff72847fb469de9fcc252fab0d838313c5dcd
+    md5: 963e8ceccba45b5cf15f33906d5a20a1
+    sha256: 9da8b43e2bcd47bc43015e85af96dd44394fbd51eb9b4fae61ec6e082c404231
   manager: conda
   name: certifi
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/certifi-2022.6.15.2-pyhd8ed1ab_0.tar.bz2
-  version: 2022.6.15.2
+  url: https://conda.anaconda.org/conda-forge/noarch/certifi-2022.9.14-pyhd8ed1ab_0.tar.bz2
+  version: 2022.9.14
 - category: main
   dependencies:
     python: '>=3.6'
@@ -2266,14 +2392,14 @@ package:
   dependencies:
     python: '>=3.6'
   hash:
-    md5: 40b50b8b030f5f2f22085c062ed013dd
-    sha256: d697b7db5194d5248850b57fd313ecbb29bba9aaab0346ee55816589afbd1d0e
+    md5: 34272b248891bddccc64479f9a7fffed
+    sha256: 9887c35c374ec1847f167292d3fde023cb4c994a4ceeec283072b95440131f09
   manager: conda
   name: idna
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/idna-3.3-pyhd8ed1ab_0.tar.bz2
-  version: '3.3'
+  url: https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2
+  version: '3.4'
 - category: main
   dependencies:
     python: '>=3.4'
@@ -3094,21 +3220,21 @@ package:
 - category: main
   dependencies:
     cairo: '>=1.16.0,<1.17.0a0'
-    freetype: '>=2.10.4,<3.0a0'
+    freetype: '>=2.12.1,<3.0a0'
     graphite2: ''
     icu: '>=70.1,<71.0a0'
     libgcc-ng: '>=12'
     libglib: '>=2.72.1,<3.0a0'
     libstdcxx-ng: '>=12'
   hash:
-    md5: 7c1f73a8f7864a202b126d82e88ddffc
-    sha256: 4c4d7b248b44b30b7a261d1ff0743fdf6dfe4cafc55b7e0ed36ac0980275c798
+    md5: 3c5f4fbd64c7254fbe246ca9d87863b6
+    sha256: 4def14eb862e0b05ffce33edbfc2cfc4d0e1720f134d52e378c4b661467069cf
   manager: conda
   name: harfbuzz
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-5.1.0-hf9f4e7c_0.tar.bz2
-  version: 5.1.0
+  url: https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-5.2.0-hf9f4e7c_0.tar.bz2
+  version: 5.2.0
 - category: main
   dependencies:
     python: ''
@@ -3666,20 +3792,19 @@ package:
   version: 1.2.2
 - category: main
   dependencies:
-    libgcc-ng: '>=10.3.0'
+    libgcc-ng: '>=12'
     python: '>=3.9,<3.10.0a0'
     python_abi: 3.9.* *_cp39
-    six: ''
     tqdm: ''
   hash:
-    md5: 1fadb17b68893d479b0a01981570a494
-    sha256: 48a7ee1df5a9685ea53640cc60c7db3bcf6982548a21a781e31ae37d6be62e05
+    md5: ae2e8e8dd87ed4286c89fc8c081e9bdf
+    sha256: e11ea9eac5dcaf43b3a3292c8daeed9f6c9dbf568a7ca2e27909d3a95c35ef35
   manager: conda
   name: conda-package-handling
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/conda-package-handling-1.8.1-py39hb9d737c_1.tar.bz2
-  version: 1.8.1
+  url: https://conda.anaconda.org/conda-forge/linux-64/conda-package-handling-1.9.0-py39hb9d737c_0.tar.bz2
+  version: 1.9.0
 - category: main
   dependencies:
     cffi: '>=1.12'
@@ -3921,21 +4046,21 @@ package:
     cairo: '>=1.16.0,<1.17.0a0'
     fontconfig: '>=2.13.96,<3.0a0'
     fonts-conda-ecosystem: ''
-    freetype: '>=2.10.4,<3.0a0'
+    freetype: '>=2.12.1,<3.0a0'
     fribidi: '>=1.0.10,<2.0a0'
     harfbuzz: '>=5.1.0,<6.0a0'
     libgcc-ng: '>=12'
     libglib: '>=2.72.1,<3.0a0'
-    libpng: '>=1.6.37,<1.7.0a0'
+    libpng: '>=1.6.38,<1.7.0a0'
   hash:
-    md5: b8e090dce29a036357552a009c770187
-    sha256: 54ff68742e0dc0be69bf7c43a8072e7de31a28c544ad64608ceef6bf1a974315
+    md5: fead2b3178129155c334c751df4daba6
+    sha256: b3bce2d710dbaeb6e704099f5b8866d56e83afd4bc15007f5b31fd8b46509c9c
   manager: conda
   name: pango
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/pango-1.50.9-hc4f8a73_0.tar.bz2
-  version: 1.50.9
+  url: https://conda.anaconda.org/conda-forge/linux-64/pango-1.50.10-hc4f8a73_0.tar.bz2
+  version: 1.50.10
 - category: main
   dependencies:
     python: '>=3.7'
@@ -4298,14 +4423,14 @@ package:
     python_abi: 3.9.* *_cp39
     secretstorage: '>=3.2'
   hash:
-    md5: f3bd338c8e20deccf48121d487e632d2
-    sha256: c24846a336e26985753d202a1d64514804dd667b38cfbfad9ae6cd4cc233f6e9
+    md5: 53de394e0ab10ccb6b9db0528050123f
+    sha256: 4e5d918992cd28e91382c9bbc7e2911530d51641f03cbc33ed0eb98297b2a5eb
   manager: conda
   name: keyring
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/keyring-23.9.1-py39hf3d152e_0.tar.bz2
-  version: 23.9.1
+  url: https://conda.anaconda.org/conda-forge/linux-64/keyring-23.9.3-py39hf3d152e_0.tar.bz2
+  version: 23.9.3
 - category: main
   dependencies:
     attrs: ''
@@ -4746,14 +4871,14 @@ package:
     sarif-om: ~=1.0.4
     six: '>=1.11'
   hash:
-    md5: 9b30cdd9b64cb4b749371980f1208f0f
-    sha256: 561034692d6f08f4aba92a61dc828812b0c98c31bc3ca8facb91843a646cb1ae
+    md5: 0a4bc1ea085254997e21f9c505c1495a
+    sha256: 5d227b4ad729a4ef43b28436466b47ebb3915a15ad968b81872726e8a05626f2
   manager: conda
   name: cfn-lint
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/cfn-lint-0.65.0-pyhd8ed1ab_0.tar.bz2
-  version: 0.65.0
+  url: https://conda.anaconda.org/conda-forge/noarch/cfn-lint-0.65.1-pyhd8ed1ab_0.tar.bz2
+  version: 0.65.1
 - category: main
   dependencies:
     aws-xray-sdk: '!=0.96,>=0.93'
diff --git a/conda-requirements-esp-tools.yaml b/conda-requirements-esp-tools.yaml
index 39544122..2616a1a8 100644
--- a/conda-requirements-esp-tools.yaml
+++ b/conda-requirements-esp-tools.yaml
@@ -21,7 +21,7 @@ dependencies:
 
     - gcc
     - gxx
-    - sysroot_linux-64=2.17 # needed to match pre-built CI XRT glibc version
+    - sysroot_linux-64>=2.17 # needed to match pre-built CI XRT glibc version
     - conda-gcc-specs
     - binutils
 
@@ -29,7 +29,18 @@ dependencies:
     - esp-tools # from ucb-bar channel - https://github.com/ucb-bar/esp-tools-feedstock
 
     # firemarshal deps
-    - python=3.9
+    - python>=3.8
+    - bc
+    - patch
+    - which
+    - diffutils
+    - bash
+    - gzip
+    - bzip2
+    - perl
+    - tar
+    - file
+    - findutils
     - rsync
     - psutil
     - doit=0.35.0
@@ -40,8 +51,7 @@ dependencies:
     - bison
     - flex
     - expat
-    # current version of buildroot won't build with make 4.3 https://github.com/firesim/FireMarshal/issues/236
-    - make!=4.3
+    - make
     - pyyaml
     - unzip
     - readline
@@ -49,8 +59,6 @@ dependencies:
     - lzop
     - qemu # from ucb-bar channel - https://github.com/ucb-bar/qemu-feedstock
 
-    # current version of buildroot won't build with make 4.3 https://github.com/firesim/FireMarshal/issues/236
-    - make!=4.3
     - bash-completion
     - sbt
     - ca-certificates
@@ -75,7 +83,7 @@ dependencies:
     - screen
     - elfutils
     - libdwarf-dev==0.0.0.20190110_28_ga81397fc4 # from ucb-bar channel - using mainline libdwarf-feedstock
-    - conda-lock
+    - conda-lock>=1
     - wget
     - sed
     - autoconf
diff --git a/conda-requirements-riscv-tools-linux-64.conda-lock.yml b/conda-requirements-riscv-tools-linux-64.conda-lock.yml
index c2f3ae84..ba7fb51c 100644
--- a/conda-requirements-riscv-tools-linux-64.conda-lock.yml
+++ b/conda-requirements-riscv-tools-linux-64.conda-lock.yml
@@ -9,7 +9,7 @@
 # To update a single package to the latest version compatible with the version constraints in the source:
 #     conda-lock lock --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml --update PACKAGE
 # To re-solve the entire environment, e.g. after changing a version constraint in the source file:
-#     conda-lock -f /home/ubuntu/work/cy2/conda-requirements-riscv-tools.yaml -f /scratch/abejgonza/chipyard-2/conda-requirements-riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml
+#     conda-lock -f /scratch/buildbot/firesim/target-design/chipyard/conda-requirements-riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml
 metadata:
   channels:
   - url: ucb-bar
@@ -19,12 +19,11 @@ metadata:
   - url: nodefaults
     used_env_vars: []
   content_hash:
-    linux-64: 6f0d652591e84f2b5e368d352cebd604f40e1f723d2fccc5056234af7e6f0fbd
+    linux-64: e0eaa8e6d532cfd33d97846ae17a35f71e62c135ff3edb6236f6d8d592b10e7a
   platforms:
   - linux-64
   sources:
-  - /home/ubuntu/work/cy2/conda-requirements-riscv-tools.yaml
-  - /scratch/abejgonza/chipyard-2/conda-requirements-riscv-tools.yaml
+  - /scratch/buildbot/firesim/target-design/chipyard/conda-requirements-riscv-tools.yaml
 package:
 - category: main
   dependencies: {}
@@ -62,14 +61,14 @@ package:
 - category: main
   dependencies: {}
   hash:
-    md5: 64f6be425cd4897e5df1a9e9ac4dcb86
-    sha256: c0b84c0430c4a81c8f5415b268889880bdb695ef74c952378313929869aaec6d
+    md5: 87c986dab320658abaf3e701406b665c
+    sha256: 26a1a2d9e63440ec3b2a59297d47f7d5b405a3caab61bf93648e1621a46bb05a
   manager: conda
   name: ca-certificates
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2022.6.15.2-ha878542_0.tar.bz2
-  version: 2022.6.15.2
+  url: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2022.9.14-ha878542_0.tar.bz2
+  version: 2022.9.14
 - category: main
   dependencies: {}
   hash:
@@ -318,6 +317,18 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/alsa-lib-1.2.7.2-h166bdaf_0.tar.bz2
   version: 1.2.7.2
+- category: main
+  dependencies:
+    libgcc-ng: '>=9.4.0'
+  hash:
+    md5: 9ff50d162aa3b1c861fa30105bea1932
+    sha256: c5e04d9408a0047bd87156b1853a4ac31cb3a5ccdc52374d89c72cbdabe95002
+  manager: conda
+  name: bc
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/bc-1.07.1-h7f98852_0.tar.bz2
+  version: 1.07.1
 - category: main
   dependencies:
     binutils_impl_linux-64: '>=2.36.1,<2.36.2.0a0'
@@ -479,6 +490,18 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/graphite2-1.3.13-h58526e2_1001.tar.bz2
   version: 1.3.13
+- category: main
+  dependencies:
+    libgcc-ng: '>=10.3.0'
+  hash:
+    md5: 30bd3316aac2d72f498a04b2a49c1050
+    sha256: 9a233d5f734f2a4bed786041a9823b69dad5b6757d84341e9f5c822ec89f083b
+  manager: conda
+  name: gzip
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/gzip-1.12-h166bdaf_0.tar.bz2
+  version: '1.12'
 - category: main
   dependencies:
     libgcc-ng: '>=10.3.0'
@@ -750,16 +773,16 @@ package:
   version: 1.4.18
 - category: main
   dependencies:
-    libgcc-ng: '>=7.3.0'
+    libgcc-ng: '>=7.5.0'
   hash:
-    md5: 17a8703794c6960bc79e9966c1e113ab
-    sha256: 1e29c4ea36409b66719cfce3dd9bb1e6a5b366731a0beffaaa77928e514d54fc
+    md5: 4049ebfd3190b580dffe76daed26155a
+    sha256: 4a5fe7c80bb0de0015328e2d3fc8db1736f528cb1fd53cd0d5527e24269a4f7c
   manager: conda
   name: make
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/make-4.2.1-h14c3975_2004.tar.bz2
-  version: 4.2.1
+  url: https://conda.anaconda.org/conda-forge/linux-64/make-4.3-hd18ef5c_1.tar.bz2
+  version: '4.3'
 - category: main
   dependencies:
     libgcc-ng: '>=10.3.0'
@@ -797,6 +820,18 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/openssl-1.1.1q-h166bdaf_0.tar.bz2
   version: 1.1.1q
+- category: main
+  dependencies:
+    libgcc-ng: '>=9.3.0'
+  hash:
+    md5: 4c1bbbec45149a186b915c67d086ed3b
+    sha256: fc30d1b643c35d82abd294cde6b34f7b9e952856c0386f4f069c3a2b7feb28dd
+  manager: conda
+  name: patch
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/patch-2.7.6-h7f98852_1002.tar.bz2
+  version: 2.7.6
 - category: main
   dependencies:
     libgcc-ng: '>=9.3.0'
@@ -870,6 +905,18 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/unzip-6.0-h7f98852_3.tar.bz2
   version: '6.0'
+- category: main
+  dependencies:
+    libgcc-ng: '>=7.3.0'
+  hash:
+    md5: 2e5f1a8199794b21c9472c1a7f27e21a
+    sha256: a3ee6c02932fbee32babe39fa6bda9f781d6dc17122d2a90e62ff2b6866a5de8
+  manager: conda
+  name: which
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/which-2.21-h516909a_0.tar.bz2
+  version: '2.21'
 - category: main
   dependencies:
     libgcc-ng: '>=9.3.0'
@@ -1014,6 +1061,19 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/yaml-0.2.5-h7f98852_2.tar.bz2
   version: 0.2.5
+- category: main
+  dependencies:
+    libgcc-ng: '>=9.3.0'
+    libiconv: '>=1.16,<1.17.0a0'
+  hash:
+    md5: af46eaa305af6768321779615ed88ac4
+    sha256: 016719d88e6f84af579606cfd5e8d52b9c31c9ad38c54b92fff5d49044ca5673
+  manager: conda
+  name: diffutils
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/diffutils-3.8-ha1f6473_0.tar.bz2
+  version: '3.8'
 - category: main
   dependencies:
     libfdt: '>=1.6.1,<1.7.0a0'
@@ -1112,6 +1172,19 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/libllvm14-14.0.6-he0ac6c6_0.tar.bz2
   version: 14.0.6
+- category: main
+  dependencies:
+    libgcc-ng: '>=12'
+    libzlib: '>=1.2.12,<1.3.0a0'
+  hash:
+    md5: fe3ab1049214fca5620b7b96af1a6a55
+    sha256: de50b620811232548e3913bc1c19b28b17cc782447e9cb5cd8faa0cfbd15e966
+  manager: conda
+  name: libmagic
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/libmagic-5.39-h753d276_1.tar.bz2
+  version: '5.39'
 - category: main
   dependencies:
     c-ares: '>=1.18.1,<2.0a0'
@@ -1134,14 +1207,14 @@ package:
     libgcc-ng: '>=12'
     libzlib: '>=1.2.12,<1.3.0a0'
   hash:
-    md5: 6b611734b73d639c084ac4be2fcd996a
-    sha256: f1c48c6a6c829c481db0ea8f95abdef1d28bf53e6430e882323d3e675e880dd5
+    md5: 575078de1d3a3114b3ce131bd1508d0c
+    sha256: 422a544fbfc8d8bf43de4b2dc5c7c991294ad0e37b37439d8dbf740f07a75437
   manager: conda
   name: libpng
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.37-h753d276_4.tar.bz2
-  version: 1.6.37
+  url: https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.38-h753d276_0.tar.bz2
+  version: 1.6.38
 - category: main
   dependencies:
     libgcc-ng: '>=12'
@@ -1320,6 +1393,19 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/screen-4.8.0-he28a2e2_0.tar.bz2
   version: 4.8.0
+- category: main
+  dependencies:
+    libgcc-ng: '>=9.3.0'
+    libiconv: '>=1.16,<1.17.0a0'
+  hash:
+    md5: 33614741eb453005e0c74e027c325508
+    sha256: 967aa10d9197b2a9753f21cb9e7d729560d90df41eb2fa2a3e2ffcb66891d98b
+  manager: conda
+  name: tar
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/tar-1.34-ha1f6473_0.tar.bz2
+  version: '1.34'
 - category: main
   dependencies:
     libgcc-ng: '>=9.4.0'
@@ -1401,6 +1487,19 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/autoconf-2.69-pl5321hd708f79_11.tar.bz2
   version: '2.69'
+- category: main
+  dependencies:
+    libgcc-ng: '>=10.3.0'
+    readline: '>=8.1,<9.0a0'
+  hash:
+    md5: 54d1a374b75f14ecc58aea8c4236c0c3
+    sha256: 6415903ad8774fc0f1bf5b156ae0b6f9988427a0f14bb35467c5938f05fe8707
+  manager: conda
+  name: bash
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/bash-5.1.16-hd863ed2_0.tar.bz2
+  version: 5.1.16
 - category: main
   dependencies:
     flex: ''
@@ -1440,6 +1539,33 @@ package:
   platform: linux-64
   url: https://conda.anaconda.org/conda-forge/linux-64/expect-5.45.4-h555a92e_0.tar.bz2
   version: 5.45.4
+- category: main
+  dependencies:
+    libgcc-ng: '>=12'
+    libmagic: 5.39 h753d276_1
+    libzlib: '>=1.2.12,<1.3.0a0'
+  hash:
+    md5: a0f7ed92aaa3b6d109e6e2301e502c24
+    sha256: 8c3b26e7241324a4fb8a19966e67af043781e6feb4a7393608e5ebcc84410b62
+  manager: conda
+  name: file
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/file-5.39-h753d276_1.tar.bz2
+  version: '5.39'
+- category: main
+  dependencies:
+    gettext: ''
+    libgcc-ng: '>=9.4.0'
+  hash:
+    md5: 8d0b19bcc4a822e154eaf924483c9edb
+    sha256: 377377897759dc0183ad2db9a3c4472d50d81a74b62ad974f32109900d891743
+  manager: conda
+  name: findutils
+  optional: false
+  platform: linux-64
+  url: https://conda.anaconda.org/conda-forge/linux-64/findutils-4.6.0-h7f98852_1001.tar.bz2
+  version: 4.6.0
 - category: main
   dependencies:
     libgcc-ng: '>=12'
@@ -1767,20 +1893,20 @@ package:
 - category: main
   dependencies:
     jpeg: '>=9e,<10a'
-    libgcc-ng: '>=10.3.0'
-    libglib: '>=2.70.2,<3.0a0'
-    libpng: '>=1.6.37,<1.7.0a0'
-    libtiff: '>=4.3.0,<5.0a0'
-    libzlib: '>=1.2.11,<1.3.0a0'
-    zlib: '>=1.2.11,<1.3.0a0'
+    libgcc-ng: '>=12'
+    libglib: '>=2.72.1,<3.0a0'
+    libpng: '>=1.6.38,<1.7.0a0'
+    libtiff: '>=4.4.0,<5.0a0'
+    libzlib: '>=1.2.12,<1.3.0a0'
+    zlib: '>=1.2.12,<1.3.0a0'
   hash:
-    md5: 908fc30f89e27817d835b45f865536d7
-    sha256: 26e5dffede1e068004e7d060a91e003cdf3d9df859a5dc0c4e4378c746b087d9
+    md5: a61c6312192e7c9de71548a6706a21e6
+    sha256: b7379d19afe924b39e29e47b046f99a4a737f58a210c27d083391c0f8f012aad
   manager: conda
   name: gdk-pixbuf
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.8-hff1cb4f_0.tar.bz2
+  url: https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.8-hff1cb4f_1.tar.bz2
   version: 2.42.8
 - category: main
   dependencies:
@@ -2090,7 +2216,7 @@ package:
     icu: '>=70.1,<71.0a0'
     libgcc-ng: '>=12'
     libglib: '>=2.72.1,<3.0a0'
-    libpng: '>=1.6.37,<1.7.0a0'
+    libpng: '>=1.6.38,<1.7.0a0'
     libxcb: '>=1.13,<1.14.0a0'
     libzlib: '>=1.2.12,<1.3.0a0'
     pixman: '>=0.40.0,<1.0a0'
@@ -2101,26 +2227,26 @@ package:
     xorg-libxrender: ''
     zlib: '>=1.2.12,<1.3.0a0'
   hash:
-    md5: 148e1893454972ac8c595c98c7b8ed5c
-    sha256: 351e8033d931cdedf14dd4fdb34bc3eb38c965d5a7f7a29be13a001d42a1fa4d
+    md5: d1a88f3ed5b52e1024b80d4bcd26a7a0
+    sha256: f062cf56e6e50d3ad4b425ebb3765ca9138c6ebc52e6a42d1377de8bc8d954f6
   manager: conda
   name: cairo
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-ha61ee94_1013.tar.bz2
+  url: https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-ha61ee94_1014.tar.bz2
   version: 1.16.0
 - category: main
   dependencies:
     python: '>=3.7'
   hash:
-    md5: 1bd4c453b6d4e446333f857907b0f465
-    sha256: c09e9ffb10141d82ddecf114aebff72847fb469de9fcc252fab0d838313c5dcd
+    md5: 963e8ceccba45b5cf15f33906d5a20a1
+    sha256: 9da8b43e2bcd47bc43015e85af96dd44394fbd51eb9b4fae61ec6e082c404231
   manager: conda
   name: certifi
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/certifi-2022.6.15.2-pyhd8ed1ab_0.tar.bz2
-  version: 2022.6.15.2
+  url: https://conda.anaconda.org/conda-forge/noarch/certifi-2022.9.14-pyhd8ed1ab_0.tar.bz2
+  version: 2022.9.14
 - category: main
   dependencies:
     python: '>=3.6'
@@ -2266,14 +2392,14 @@ package:
   dependencies:
     python: '>=3.6'
   hash:
-    md5: 40b50b8b030f5f2f22085c062ed013dd
-    sha256: d697b7db5194d5248850b57fd313ecbb29bba9aaab0346ee55816589afbd1d0e
+    md5: 34272b248891bddccc64479f9a7fffed
+    sha256: 9887c35c374ec1847f167292d3fde023cb4c994a4ceeec283072b95440131f09
   manager: conda
   name: idna
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/idna-3.3-pyhd8ed1ab_0.tar.bz2
-  version: '3.3'
+  url: https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2
+  version: '3.4'
 - category: main
   dependencies:
     python: '>=3.4'
@@ -3076,21 +3202,21 @@ package:
 - category: main
   dependencies:
     cairo: '>=1.16.0,<1.17.0a0'
-    freetype: '>=2.10.4,<3.0a0'
+    freetype: '>=2.12.1,<3.0a0'
     graphite2: ''
     icu: '>=70.1,<71.0a0'
     libgcc-ng: '>=12'
     libglib: '>=2.72.1,<3.0a0'
     libstdcxx-ng: '>=12'
   hash:
-    md5: 7c1f73a8f7864a202b126d82e88ddffc
-    sha256: 4c4d7b248b44b30b7a261d1ff0743fdf6dfe4cafc55b7e0ed36ac0980275c798
+    md5: 3c5f4fbd64c7254fbe246ca9d87863b6
+    sha256: 4def14eb862e0b05ffce33edbfc2cfc4d0e1720f134d52e378c4b661467069cf
   manager: conda
   name: harfbuzz
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-5.1.0-hf9f4e7c_0.tar.bz2
-  version: 5.1.0
+  url: https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-5.2.0-hf9f4e7c_0.tar.bz2
+  version: 5.2.0
 - category: main
   dependencies:
     python: ''
@@ -3666,20 +3792,19 @@ package:
   version: 1.2.2
 - category: main
   dependencies:
-    libgcc-ng: '>=10.3.0'
+    libgcc-ng: '>=12'
     python: '>=3.9,<3.10.0a0'
     python_abi: 3.9.* *_cp39
-    six: ''
     tqdm: ''
   hash:
-    md5: 1fadb17b68893d479b0a01981570a494
-    sha256: 48a7ee1df5a9685ea53640cc60c7db3bcf6982548a21a781e31ae37d6be62e05
+    md5: ae2e8e8dd87ed4286c89fc8c081e9bdf
+    sha256: e11ea9eac5dcaf43b3a3292c8daeed9f6c9dbf568a7ca2e27909d3a95c35ef35
   manager: conda
   name: conda-package-handling
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/conda-package-handling-1.8.1-py39hb9d737c_1.tar.bz2
-  version: 1.8.1
+  url: https://conda.anaconda.org/conda-forge/linux-64/conda-package-handling-1.9.0-py39hb9d737c_0.tar.bz2
+  version: 1.9.0
 - category: main
   dependencies:
     cffi: '>=1.12'
@@ -3921,21 +4046,21 @@ package:
     cairo: '>=1.16.0,<1.17.0a0'
     fontconfig: '>=2.13.96,<3.0a0'
     fonts-conda-ecosystem: ''
-    freetype: '>=2.10.4,<3.0a0'
+    freetype: '>=2.12.1,<3.0a0'
     fribidi: '>=1.0.10,<2.0a0'
     harfbuzz: '>=5.1.0,<6.0a0'
     libgcc-ng: '>=12'
     libglib: '>=2.72.1,<3.0a0'
-    libpng: '>=1.6.37,<1.7.0a0'
+    libpng: '>=1.6.38,<1.7.0a0'
   hash:
-    md5: b8e090dce29a036357552a009c770187
-    sha256: 54ff68742e0dc0be69bf7c43a8072e7de31a28c544ad64608ceef6bf1a974315
+    md5: fead2b3178129155c334c751df4daba6
+    sha256: b3bce2d710dbaeb6e704099f5b8866d56e83afd4bc15007f5b31fd8b46509c9c
   manager: conda
   name: pango
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/pango-1.50.9-hc4f8a73_0.tar.bz2
-  version: 1.50.9
+  url: https://conda.anaconda.org/conda-forge/linux-64/pango-1.50.10-hc4f8a73_0.tar.bz2
+  version: 1.50.10
 - category: main
   dependencies:
     python: '>=3.7'
@@ -4298,14 +4423,14 @@ package:
     python_abi: 3.9.* *_cp39
     secretstorage: '>=3.2'
   hash:
-    md5: f3bd338c8e20deccf48121d487e632d2
-    sha256: c24846a336e26985753d202a1d64514804dd667b38cfbfad9ae6cd4cc233f6e9
+    md5: 53de394e0ab10ccb6b9db0528050123f
+    sha256: 4e5d918992cd28e91382c9bbc7e2911530d51641f03cbc33ed0eb98297b2a5eb
   manager: conda
   name: keyring
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/linux-64/keyring-23.9.1-py39hf3d152e_0.tar.bz2
-  version: 23.9.1
+  url: https://conda.anaconda.org/conda-forge/linux-64/keyring-23.9.3-py39hf3d152e_0.tar.bz2
+  version: 23.9.3
 - category: main
   dependencies:
     attrs: ''
@@ -4746,14 +4871,14 @@ package:
     sarif-om: ~=1.0.4
     six: '>=1.11'
   hash:
-    md5: 9b30cdd9b64cb4b749371980f1208f0f
-    sha256: 561034692d6f08f4aba92a61dc828812b0c98c31bc3ca8facb91843a646cb1ae
+    md5: 0a4bc1ea085254997e21f9c505c1495a
+    sha256: 5d227b4ad729a4ef43b28436466b47ebb3915a15ad968b81872726e8a05626f2
   manager: conda
   name: cfn-lint
   optional: false
   platform: linux-64
-  url: https://conda.anaconda.org/conda-forge/noarch/cfn-lint-0.65.0-pyhd8ed1ab_0.tar.bz2
-  version: 0.65.0
+  url: https://conda.anaconda.org/conda-forge/noarch/cfn-lint-0.65.1-pyhd8ed1ab_0.tar.bz2
+  version: 0.65.1
 - category: main
   dependencies:
     aws-xray-sdk: '!=0.96,>=0.93'
diff --git a/conda-requirements-riscv-tools.yaml b/conda-requirements-riscv-tools.yaml
index 754e2627..7c7803f5 100644
--- a/conda-requirements-riscv-tools.yaml
+++ b/conda-requirements-riscv-tools.yaml
@@ -21,7 +21,7 @@ dependencies:
 
     - gcc
     - gxx
-    - sysroot_linux-64=2.17 # needed to match pre-built CI XRT glibc version
+    - sysroot_linux-64>=2.17 # needed to match pre-built CI XRT glibc version
     - conda-gcc-specs
     - binutils
 
@@ -29,7 +29,18 @@ dependencies:
     - riscv-tools # from ucb-bar channel - https://github.com/ucb-bar/riscv-tools-feedstock
 
     # firemarshal deps
-    - python=3.9
+    - python>=3.8
+    - bc
+    - patch
+    - which
+    - diffutils
+    - bash
+    - gzip
+    - bzip2
+    - perl
+    - tar
+    - file
+    - findutils
     - rsync
     - psutil
     - doit=0.35.0
@@ -40,8 +51,7 @@ dependencies:
     - bison
     - flex
     - expat
-    # current version of buildroot won't build with make 4.3 https://github.com/firesim/FireMarshal/issues/236
-    - make!=4.3
+    - make
     - pyyaml
     - unzip
     - readline
@@ -49,8 +59,6 @@ dependencies:
     - lzop
     - qemu # from ucb-bar channel - https://github.com/ucb-bar/qemu-feedstock
 
-    # current version of buildroot won't build with make 4.3 https://github.com/firesim/FireMarshal/issues/236
-    - make!=4.3
     - bash-completion
     - sbt
     - ca-certificates
@@ -75,7 +83,7 @@ dependencies:
     - screen
     - elfutils
     - libdwarf-dev==0.0.0.20190110_28_ga81397fc4 # from ucb-bar channel - using mainline libdwarf-feedstock
-    - conda-lock
+    - conda-lock>=1
     - wget
     - sed
     - autoconf
diff --git a/fpga/fpga-shells b/fpga/fpga-shells
index f9fb9fd3..60adb8c6 160000
--- a/fpga/fpga-shells
+++ b/fpga/fpga-shells
@@ -1 +1 @@
-Subproject commit f9fb9fd338e5fca2ff5116b1d01506c424280d70
+Subproject commit 60adb8c62c81c57b7eabd0402d9505c0ea1545f9
diff --git a/generators/boom b/generators/boom
index ad64c541..fac2c370 160000
--- a/generators/boom
+++ b/generators/boom
@@ -1 +1 @@
-Subproject commit ad64c5419151e5e886daee7084d8399713b46b4b
+Subproject commit fac2c370c9deae97ca52aca6b34857e9ac0f6e9d
diff --git a/generators/chipyard/src/main/scala/CustomBusTopologies.scala b/generators/chipyard/src/main/scala/CustomBusTopologies.scala
deleted file mode 100644
index 7bbd53f1..00000000
--- a/generators/chipyard/src/main/scala/CustomBusTopologies.scala
+++ /dev/null
@@ -1,82 +0,0 @@
-
-package chipyard
-
-import freechips.rocketchip.config.{Field, Config, Parameters}
-import freechips.rocketchip.diplomacy._
-import freechips.rocketchip.tilelink._
-import freechips.rocketchip.util.{Location, Symmetric}
-import freechips.rocketchip.subsystem._
-
-// I'm putting this code here temporarily as I think it should be a candidate
-// for upstreaming based on input from Henry Cook, but don't wnat to deal with
-// an RC branch just yet.
-
-// For subsystem/BusTopology.scala
-
-// Biancolin: This, modified from Henry's email
-/** Parameterization of a topology containing a banked coherence manager and a bus for attaching memory devices. */
-case class CoherentMulticlockBusTopologyParams(
-  sbus: SystemBusParams, // TODO remove this after better width propagation
-  mbus: MemoryBusParams,
-  l2: BankedL2Params,
-  sbusToMbusXType: ClockCrossingType = NoCrossing
-) extends TLBusWrapperTopology(
-  instantiations = (if (l2.nBanks == 0) Nil else List(
-    (MBUS, mbus),
-    (L2, CoherenceManagerWrapperParams(mbus.blockBytes, mbus.beatBytes, l2.nBanks, L2.name)(l2.coherenceManager)))),
-  connections = if (l2.nBanks == 0) Nil else List(
-    (SBUS, L2,   TLBusWrapperConnection(xType = NoCrossing, driveClockFromMaster = Some(true), nodeBinding = BIND_STAR)()),
-    (L2,  MBUS,  TLBusWrapperConnection.crossTo(
-      xType = sbusToMbusXType,
-      driveClockFromMaster = None,
-      nodeBinding = BIND_QUERY))
-  )
-)
-
-// This differs from upstream only in that it does not use the legacy crossTo
-// and crossFrom functions, and it ensures driveClockFromMaster = None
-case class HierarchicalMulticlockBusTopologyParams(
-  pbus: PeripheryBusParams,
-  fbus: FrontBusParams,
-  cbus: PeripheryBusParams,
-  xTypes: SubsystemCrossingParams
-) extends TLBusWrapperTopology(
-  instantiations = List(
-    (PBUS, pbus),
-    (FBUS, fbus),
-    (CBUS, cbus)),
-  connections = List(
-    (SBUS, CBUS, TLBusWrapperConnection.  crossTo(xType = xTypes.sbusToCbusXType, driveClockFromMaster = None)),
-    (CBUS, PBUS, TLBusWrapperConnection.  crossTo(xType = xTypes.cbusToPbusXType, driveClockFromMaster = None)),
-    (FBUS, SBUS, TLBusWrapperConnection.crossFrom(xType = xTypes.fbusToSbusXType, driveClockFromMaster = None)))
-)
-
-// For subsystem/Configs.scala
-
-class WithMulticlockCoherentBusTopology extends Config((site, here, up) => {
-  case TLNetworkTopologyLocated(InSubsystem) => List(
-    JustOneBusTopologyParams(sbus = site(SystemBusKey)),
-    HierarchicalMulticlockBusTopologyParams(
-      pbus = site(PeripheryBusKey),
-      fbus = site(FrontBusKey),
-      cbus = site(ControlBusKey),
-      xTypes = SubsystemCrossingParams(
-        sbusToCbusXType = site(SbusToCbusXTypeKey),
-        cbusToPbusXType = site(CbusToPbusXTypeKey),
-        fbusToSbusXType = site(FbusToSbusXTypeKey))),
-    CoherentMulticlockBusTopologyParams(
-      sbus = site(SystemBusKey),
-      mbus = site(MemoryBusKey),
-      l2 = site(BankedL2Key),
-      sbusToMbusXType = site(SbusToMbusXTypeKey)))
-})
-
-class WithMulticlockIncoherentBusTopology extends Config((site, here, up) => {
-  case TLNetworkTopologyLocated(InSubsystem) => List(
-    JustOneBusTopologyParams(sbus = site(SystemBusKey)),
-    HierarchicalMulticlockBusTopologyParams(
-      pbus = site(PeripheryBusKey),
-      fbus = site(FrontBusKey),
-      cbus = site(ControlBusKey),
-      xTypes = SubsystemCrossingParams()))
-})
diff --git a/generators/chipyard/src/main/scala/Subsystem.scala b/generators/chipyard/src/main/scala/Subsystem.scala
index 93d7c237..f5e35477 100644
--- a/generators/chipyard/src/main/scala/Subsystem.scala
+++ b/generators/chipyard/src/main/scala/Subsystem.scala
@@ -13,8 +13,6 @@ import freechips.rocketchip.config.{Field, Parameters}
 import freechips.rocketchip.devices.tilelink._
 import freechips.rocketchip.devices.debug.{HasPeripheryDebug, HasPeripheryDebugModuleImp, ExportDebug, DebugModuleKey}
 import freechips.rocketchip.diplomacy._
-import freechips.rocketchip.diplomaticobjectmodel.model.{OMInterrupt}
-import freechips.rocketchip.diplomaticobjectmodel.logicaltree.{RocketTileLogicalTreeNode, LogicalModuleTree}
 import freechips.rocketchip.tile._
 import freechips.rocketchip.tilelink._
 import freechips.rocketchip.interrupts._
diff --git a/generators/chipyard/src/main/scala/System.scala b/generators/chipyard/src/main/scala/System.scala
index 31bedae7..827b97c0 100644
--- a/generators/chipyard/src/main/scala/System.scala
+++ b/generators/chipyard/src/main/scala/System.scala
@@ -60,7 +60,7 @@ trait CanHaveMasterTLMemPort { this: BaseSubsystem =>
   private val device = new MemoryDevice
   private val idBits = memPortParamsOpt.map(_.master.idBits).getOrElse(1)
 
-  val memTLNode = TLManagerNode(memPortParamsOpt.map({ case MemoryPortParams(memPortParams, nMemoryChannels) =>
+  val memTLNode = TLManagerNode(memPortParamsOpt.map({ case MemoryPortParams(memPortParams, nMemoryChannels, _) =>
     Seq.tabulate(nMemoryChannels) { channel =>
       val base = AddressSet.misaligned(memPortParams.base, memPortParams.size)
       val filter = AddressSet(channel * mbus.blockBytes, ~((nMemoryChannels-1) * mbus.blockBytes))
diff --git a/generators/chipyard/src/main/scala/config/AbstractConfig.scala b/generators/chipyard/src/main/scala/config/AbstractConfig.scala
index 3cbeb32a..1f43dcbf 100644
--- a/generators/chipyard/src/main/scala/config/AbstractConfig.scala
+++ b/generators/chipyard/src/main/scala/config/AbstractConfig.scala
@@ -41,20 +41,21 @@ class AbstractConfig extends Config(
   new chipyard.iobinders.WithCustomBootPin ++
   new chipyard.iobinders.WithDividerOnlyClockGenerator ++
 
-  new testchipip.WithSerialTLWidth(32) ++                        // fatten the serialTL interface to improve testing performance
-  new testchipip.WithDefaultSerialTL ++                          // use serialized tilelink port to external serialadapter/harnessRAM
-  new chipyard.config.WithBootROM ++                             // use default bootrom
-  new chipyard.config.WithUART ++                                // add a UART
-  new chipyard.config.WithL2TLBs(1024) ++                        // use L2 TLBs
-  new chipyard.config.WithNoSubsystemDrivenClocks ++             // drive the subsystem diplomatic clocks from ChipTop instead of using implicit clocks
-  new chipyard.config.WithInheritBusFrequencyAssignments ++      // Unspecified clocks within a bus will receive the bus frequency if set
-  new chipyard.config.WithPeripheryBusFrequencyAsDefault ++      // Unspecified frequencies with match the pbus frequency (which is always set)
-  new chipyard.config.WithMemoryBusFrequency(100.0) ++           // Default 100 MHz mbus
-  new chipyard.config.WithPeripheryBusFrequency(100.0) ++        // Default 100 MHz pbus
-  new freechips.rocketchip.subsystem.WithJtagDTM ++              // set the debug module to expose a JTAG port
-  new freechips.rocketchip.subsystem.WithNoMMIOPort ++           // no top-level MMIO master port (overrides default set in rocketchip)
-  new freechips.rocketchip.subsystem.WithNoSlavePort ++          // no top-level MMIO slave port (overrides default set in rocketchip)
-  new freechips.rocketchip.subsystem.WithInclusiveCache ++       // use Sifive L2 cache
-  new freechips.rocketchip.subsystem.WithNExtTopInterrupts(0) ++ // no external interrupts
-  new chipyard.WithMulticlockCoherentBusTopology ++              // hierarchical buses including mbus+l2
-  new freechips.rocketchip.system.BaseConfig)                    // "base" rocketchip system
+  new testchipip.WithSerialTLWidth(32) ++                           // fatten the serialTL interface to improve testing performance
+  new testchipip.WithDefaultSerialTL ++                             // use serialized tilelink port to external serialadapter/harnessRAM
+  new chipyard.config.WithBootROM ++                                // use default bootrom
+  new chipyard.config.WithUART ++                                   // add a UART
+  new chipyard.config.WithL2TLBs(1024) ++                           // use L2 TLBs
+  new chipyard.config.WithNoSubsystemDrivenClocks ++                // drive the subsystem diplomatic clocks from ChipTop instead of using implicit clocks
+  new chipyard.config.WithInheritBusFrequencyAssignments ++         // Unspecified clocks within a bus will receive the bus frequency if set
+  new chipyard.config.WithPeripheryBusFrequencyAsDefault ++         // Unspecified frequencies with match the pbus frequency (which is always set)
+  new chipyard.config.WithMemoryBusFrequency(100.0) ++              // Default 100 MHz mbus
+  new chipyard.config.WithPeripheryBusFrequency(100.0) ++           // Default 100 MHz pbus
+  new freechips.rocketchip.subsystem.WithJtagDTM ++                 // set the debug module to expose a JTAG port
+  new freechips.rocketchip.subsystem.WithNoMMIOPort ++              // no top-level MMIO master port (overrides default set in rocketchip)
+  new freechips.rocketchip.subsystem.WithNoSlavePort ++             // no top-level MMIO slave port (overrides default set in rocketchip)
+  new freechips.rocketchip.subsystem.WithInclusiveCache ++          // use Sifive L2 cache
+  new freechips.rocketchip.subsystem.WithNExtTopInterrupts(0) ++    // no external interrupts
+  new freechips.rocketchip.subsystem.WithDontDriveBusClocksFromSBus ++ // leave the bus clocks undriven by sbus
+  new freechips.rocketchip.subsystem.WithCoherentBusTopology ++     // hierarchical buses including sbus/mbus/pbus/fbus/cbus/l2
+  new freechips.rocketchip.system.BaseConfig)                       // "base" rocketchip system
diff --git a/generators/chipyard/src/main/scala/config/RocketConfigs.scala b/generators/chipyard/src/main/scala/config/RocketConfigs.scala
index 0f9b5992..42805714 100644
--- a/generators/chipyard/src/main/scala/config/RocketConfigs.scala
+++ b/generators/chipyard/src/main/scala/config/RocketConfigs.scala
@@ -15,7 +15,7 @@ class TinyRocketConfig extends Config(
   new chipyard.config.WithTLSerialLocation(
     freechips.rocketchip.subsystem.FBUS,
     freechips.rocketchip.subsystem.PBUS) ++                       // attach TL serial adapter to f/p busses
-  new chipyard.WithMulticlockIncoherentBusTopology ++             // use incoherent bus topology
+  new freechips.rocketchip.subsystem.WithIncoherentBusTopology ++ // use incoherent bus topology
   new freechips.rocketchip.subsystem.WithNBanks(0) ++             // remove L2$
   new freechips.rocketchip.subsystem.WithNoMemPort ++             // remove backing memory
   new freechips.rocketchip.subsystem.With1TinyCore ++             // single tiny rocket-core
diff --git a/generators/chipyard/src/main/scala/example/TutorialTile.scala b/generators/chipyard/src/main/scala/example/TutorialTile.scala
index 97294428..6303e31a 100644
--- a/generators/chipyard/src/main/scala/example/TutorialTile.scala
+++ b/generators/chipyard/src/main/scala/example/TutorialTile.scala
@@ -7,7 +7,6 @@ import freechips.rocketchip.config._
 import freechips.rocketchip.subsystem._
 import freechips.rocketchip.devices.tilelink._
 import freechips.rocketchip.diplomacy._
-import freechips.rocketchip.diplomaticobjectmodel.logicaltree.{LogicalTreeNode}
 import freechips.rocketchip.rocket._
 import freechips.rocketchip.subsystem.{RocketCrossingParams}
 import freechips.rocketchip.tilelink._
diff --git a/generators/cva6 b/generators/cva6
index 705c48a1..31fd9cdf 160000
--- a/generators/cva6
+++ b/generators/cva6
@@ -1 +1 @@
-Subproject commit 705c48a1dacc011cef9b4d021a88b4948e7f9b64
+Subproject commit 31fd9cdf801b407acee3989622902db59e474f90
diff --git a/generators/firechip/src/main/scala/FireSim.scala b/generators/firechip/src/main/scala/FireSim.scala
index 3839bf14..bd35341b 100644
--- a/generators/firechip/src/main/scala/FireSim.scala
+++ b/generators/firechip/src/main/scala/FireSim.scala
@@ -262,9 +262,7 @@ class FireSim(implicit val p: Parameters) extends RawModule with HasHarnessSigna
     // instantiation of the dut, otherwise the initial instance will be
     // reused across each node
     import freechips.rocketchip.subsystem.AsyncClockGroupsKey
-    val lazyModule = LazyModule(p(BuildTop)(p.alterPartial({
-      case AsyncClockGroupsKey => p(AsyncClockGroupsKey).copy
-    })))
+    val lazyModule = LazyModule(p(BuildTop)(p))
     val module = Module(lazyModule.module)
 
     lazyModule match { case d: HasIOBinders =>
diff --git a/generators/riscv-sodor b/generators/riscv-sodor
index 5643a8e2..fc56b712 160000
--- a/generators/riscv-sodor
+++ b/generators/riscv-sodor
@@ -1 +1 @@
-Subproject commit 5643a8e245d562647f626295ad2dab9b4d5f6a13
+Subproject commit fc56b7128f8d5fd3d9022e19ee53c93e0ecfad05
diff --git a/generators/rocket-chip b/generators/rocket-chip
index 114325b2..44b0b824 160000
--- a/generators/rocket-chip
+++ b/generators/rocket-chip
@@ -1 +1 @@
-Subproject commit 114325b27cfe5312c86a8a325b187be9455a62af
+Subproject commit 44b0b8249279d25bd75ea693b725d9ff1b96e2ab
diff --git a/generators/sifive-blocks b/generators/sifive-blocks
index 545a396f..e8adf0e3 160000
--- a/generators/sifive-blocks
+++ b/generators/sifive-blocks
@@ -1 +1 @@
-Subproject commit 545a396f3486132b01ceef3cbce2085608984478
+Subproject commit e8adf0e3ef94f76f73001fbeda767d6899c60eb3
diff --git a/generators/sifive-cache b/generators/sifive-cache
index e3a3000c..2e47c707 160000
--- a/generators/sifive-cache
+++ b/generators/sifive-cache
@@ -1 +1 @@
-Subproject commit e3a3000cc1fd4cdf3a4e638e4d081b8aae94ebf0
+Subproject commit 2e47c707e04dbbbdbf81561a979c055f87ac8df2
diff --git a/generators/testchipip b/generators/testchipip
index eea390af..f99b1eb5 160000
--- a/generators/testchipip
+++ b/generators/testchipip
@@ -1 +1 @@
-Subproject commit eea390af19a05b9d6874c3ec51903d89c5520bf2
+Subproject commit f99b1eb59a34d7934059904f03237d5bc8d4a680
diff --git a/project/plugins.sbt b/project/plugins.sbt
index cf207f2d..216a060d 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,3 +1,3 @@
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.21")
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.11")
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.3")
diff --git a/sims/firesim b/sims/firesim
index f18b8497..28dcc88b 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit f18b84971ae076d2616b3e4c3b90f60392e47487
+Subproject commit 28dcc88b5bd0333476d62f3de7a52a8aad415afa
diff --git a/software/firemarshal b/software/firemarshal
index da820669..e6f9e31d 160000
--- a/software/firemarshal
+++ b/software/firemarshal
@@ -1 +1 @@
-Subproject commit da820669117f7619bfb6b7a8fc21e6080c33cfc1
+Subproject commit e6f9e31d99a1e6b19f4280beb8f32cc8e16ee4bb