diff --git a/scripts/init-submodules-no-riscv-tools.sh b/scripts/init-submodules-no-riscv-tools.sh
index e17b67ef..667f33b4 100755
--- a/scripts/init-submodules-no-riscv-tools.sh
+++ b/scripts/init-submodules-no-riscv-tools.sh
@@ -6,6 +6,18 @@ set -o pipefail
 
 RDIR=$(git rev-parse --show-toplevel)
 
+NO_FIRESIM=false
+
+while test $# -gt 0
+do
+  case "$1" in
+    --no-firesim)
+      NO_FIRESIM=true;
+      ;;
+  esac
+  shift
+done
+
 # Ignore toolchain submodules
 cd "$RDIR"
 for name in toolchains/*/*/ ; do
@@ -26,9 +38,12 @@ git config --unset submodule.vlsi/hammer-cadence-plugins.update
 git config --unset submodule.vlsi/hammer-synopsys-plugins.update
 git config --unset submodule.vlsi/hammer-mentor-plugins.update
 
-# Renable firesim and init only the required submodules to provide
-# all required scala deps, without doing a full build-setup
-git config --unset submodule.sims/firesim.update
-git submodule update --init sims/firesim
-git -C sims/firesim submodule update --init sim/midas
-git config submodule.sims/firesim.update none
+if [ "NO_FIRESIM" = false ]; then
+  # Renable firesim and init only the required submodules to provide
+  # all required scala deps, without doing a full build-setup
+  git config --unset submodule.sims/firesim.update
+  git submodule update --init sims/firesim
+  git -C sims/firesim submodule update --init sim/midas
+  git -C sims/firesim submodule update --init --recursive sw/firesim-software
+  git config submodule.sims/firesim.update none
+fi
diff --git a/sims/firesim b/sims/firesim
index 26ffba7c..ffe68ac7 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit 26ffba7cbca2982fef6b221a7abbc51d5cdc4b62
+Subproject commit ffe68ac7f69795b2cccf7d9510facd5e2db4edc6
diff --git a/software/firemarshal b/software/firemarshal
new file mode 120000
index 00000000..c1e20e80
--- /dev/null
+++ b/software/firemarshal
@@ -0,0 +1 @@
+../sims/firesim/sw/firesim-software/
\ No newline at end of file