diff --git a/software/firemarshal b/software/firemarshal
index 95cf53a6..35a20fae 160000
--- a/software/firemarshal
+++ b/software/firemarshal
@@ -1 +1 @@
-Subproject commit 95cf53a6f5bf800fcbb2fab2061f9b27df74d5dd
+Subproject commit 35a20faebbc17882a0d8923e982ac2444fe217f4
diff --git a/toolchains/riscv-tools/riscv-spike-devices b/toolchains/riscv-tools/riscv-spike-devices
index 8b4836db..39a0993b 160000
--- a/toolchains/riscv-tools/riscv-spike-devices
+++ b/toolchains/riscv-tools/riscv-spike-devices
@@ -1 +1 @@
-Subproject commit 8b4836db0b5b4ed0a9bab34e7707fe40c7c014be
+Subproject commit 39a0993b20346215c8c672e083519f02d23af67c