From 6ca1715b47a315777f2c11a33035f03c0af32309 Mon Sep 17 00:00:00 2001
From: Nathan Pemberton <nathanp@berkeley.edu>
Date: Tue, 12 Nov 2019 17:18:02 -0500
Subject: [PATCH] Bump firemarshal to not initialize linux by default. This
 bumps the sha3 generator to include the software workloads (moved from
 marshal). As a result, the sha3 generator submodule is not initialized by
 default (because it now has a copy of linux).

---
 generators/sha3                           | 2 +-
 scripts/init-submodules-no-riscv-tools.sh | 5 +++++
 sims/firesim                              | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/generators/sha3 b/generators/sha3
index 60ddfe7c..e3ff7593 160000
--- a/generators/sha3
+++ b/generators/sha3
@@ -1 +1 @@
-Subproject commit 60ddfe7c5b2c1640d91e7d9a35c65011c1600810
+Subproject commit e3ff75939d7f234a626eea641598e223f83ecb19
diff --git a/scripts/init-submodules-no-riscv-tools.sh b/scripts/init-submodules-no-riscv-tools.sh
index d8842050..faa78bb6 100755
--- a/scripts/init-submodules-no-riscv-tools.sh
+++ b/scripts/init-submodules-no-riscv-tools.sh
@@ -32,6 +32,9 @@ for name in toolchains/*/*/ ; do
 done
 git config submodule.toolchains/qemu.update none
 
+# Don't automatically initialize generators with big submodules (e.g. linux source)
+git config submodule.generators/sha3.update none
+
 # Disable updates to the FireSim submodule until explicitly requested
 git config submodule.sims/firesim.update none
 # Disable updates to the hammer tool plugins repos
@@ -49,6 +52,8 @@ 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
 
+git config --unset submodule.generators/sha3.update
+
 if [ $NO_FIRESIM = false ]; then
   echo "initializing firesim"
   # Renable firesim and init only the required submodules to provide
diff --git a/sims/firesim b/sims/firesim
index afad1b6a..e57b4ede 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit afad1b6accfaba5efbc0cfeea66372abae5ab2eb
+Subproject commit e57b4ede73d53d13cc5e7d60138a593f55a64c3b