diff --git a/.circleci/check-commit.sh b/.circleci/check-commit.sh
index 3c57d64c..98c770ad 100755
--- a/.circleci/check-commit.sh
+++ b/.circleci/check-commit.sh
@@ -48,7 +48,7 @@ search () {
     done
 }
 
-submodules=("boom" "hwacha" "icenet" "sha3" "rocket-chip" "sifive-blocks" "sifive-cache" "testchipip" "gemmini")
+submodules=("ariane" "boom" "gemmini" "hwacha" "icenet" "nvdla" "rocket-chip" "sha3" "sifive-blocks" "sifive-cache" "testchipip")
 dir="generators"
 if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ]
 then
@@ -80,12 +80,12 @@ dir="toolchains"
 branches=("master")
 search
 
-submodules=("spec2017" "coremark")
+submodules=("coremark" "firemarshal" "nvdla-workload" "spec2017")
 dir="software"
 branches=("master")
 search
 
-submodules=("axe" "barstools" "torture" "dsptools" "chisel-testers" "treadle" "firrtl-interpreter")
+submodules=("DRAMSim2" "axe" "barstools" "chisel-testers" "dsptools" "firrtl-interpreter" "torture" "treadle")
 dir="tools"
 if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ]
 then
@@ -95,6 +95,11 @@ else
 fi
 search
 
+submodules=("dromajo-src")
+dir="tools/dromajo"
+branches=("master")
+search
+
 submodules=("firesim")
 dir="sims"
 if [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "dev" ]
diff --git a/software/firemarshal b/software/firemarshal
index 141a3d36..6c6a08f9 160000
--- a/software/firemarshal
+++ b/software/firemarshal
@@ -1 +1 @@
-Subproject commit 141a3d366f4ff9ce245192c23e5cc2ad8897bc19
+Subproject commit 6c6a08f9790c660823e9f858ca87f93b2502fa44
diff --git a/vlsi/hammer-mentor-plugins b/vlsi/hammer-mentor-plugins
index 33ccdccf..67f57f12 160000
--- a/vlsi/hammer-mentor-plugins
+++ b/vlsi/hammer-mentor-plugins
@@ -1 +1 @@
-Subproject commit 33ccdccf2c04a26cceeeb03a29b9cfad38908328
+Subproject commit 67f57f120031e8c23d3d165f56c3a3c7a4064aa4