From ccd6ecd41867ca11d262425a3606eeb5a31451bb Mon Sep 17 00:00:00 2001
From: Nathan Pemberton <NathanTP@users.noreply.github.com>
Date: Sun, 9 Feb 2020 17:58:56 -0800
Subject: [PATCH] Marhsal in chipyard (#415)

* Move firemarshal into chipyard (was in firesim)
---
 .gitmodules                               |  3 +++
 scripts/build-toolchains.sh               |  2 +-
 scripts/init-submodules-no-riscv-tools.sh | 14 ++++++++++++--
 sims/firesim                              |  2 +-
 software/firemarshal                      |  2 +-
 5 files changed, 18 insertions(+), 5 deletions(-)
 mode change 120000 => 160000 software/firemarshal

diff --git a/.gitmodules b/.gitmodules
index d514a4e9..c4a9b2b9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -110,3 +110,6 @@
 [submodule "generators/gemmini"]
 	path = generators/gemmini
 	url = https://github.com/ucb-bar/gemmini
+[submodule "software/firemarshal"]
+	path = software/firemarshal
+	url = https://github.com/firesim/FireMarshal.git
diff --git a/scripts/build-toolchains.sh b/scripts/build-toolchains.sh
index d5d181e7..27c87417 100755
--- a/scripts/build-toolchains.sh
+++ b/scripts/build-toolchains.sh
@@ -141,5 +141,5 @@ cd "$RDIR"
 } > env-$TOOLCHAIN.sh
 
 # create general env.sh
-ln -sf env-$TOOLCHAIN.sh env.sh
+echo "source \$( realpath \$(dirname "\${BASH_SOURCE[0]}") )/env-$TOOLCHAIN.sh" >> env.sh
 echo "Toolchain Build Complete!"
diff --git a/scripts/init-submodules-no-riscv-tools.sh b/scripts/init-submodules-no-riscv-tools.sh
index 67e74e99..ef77374e 100755
--- a/scripts/init-submodules-no-riscv-tools.sh
+++ b/scripts/init-submodules-no-riscv-tools.sh
@@ -23,6 +23,7 @@ git config submodule.sims/firesim.update none
 git config submodule.vlsi/hammer-cadence-plugins.update none
 git config submodule.vlsi/hammer-synopsys-plugins.update none
 git config submodule.vlsi/hammer-mentor-plugins.update none
+git config submodule.software/firemarshal.update none
 git submodule update --init --recursive #--jobs 8
 
 # Un-ignore toolchain submodules
@@ -37,6 +38,8 @@ 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
+git config --unset submodule.software/firemarshal.update
+
 # Non-recursive clone to exclude riscv-linux
 git submodule update --init generators/sha3
 
@@ -47,7 +50,14 @@ git submodule update --init sims/firesim
     cd sims/firesim
     # Initialize dependencies for MIDAS-level RTL simulation
     git submodule update --init sim/midas
-    # Exclude riscv-linux
-    git submodule update --init sw/firesim-software
 )
 git config submodule.sims/firesim.update none
+
+# Only shallow clone needed for basic SW tests
+git submodule update --init software/firemarshal
+
+# Configure firemarshal to know where our firesim installation is
+if [ ! -f $RDIR/software/firemarshal/marshal-config.yaml ]; then
+  echo "firesim-dir: '../../sims/firesim/'" > $RDIR/software/firemarshal/marshal-config.yaml
+fi
+echo "PATH=\$( realpath \$(dirname "\${BASH_SOURCE[0]}") )/software/firemarshal:\$PATH" >> $RDIR/env.sh
diff --git a/sims/firesim b/sims/firesim
index b4951f25..c377a5f4 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit b4951f2589114e3849c77c798982afd10fc11b3e
+Subproject commit c377a5f4a13f95c91a2d5e6ef6c1fc45f5041deb
diff --git a/software/firemarshal b/software/firemarshal
deleted file mode 120000
index c1e20e80..00000000
--- a/software/firemarshal
+++ /dev/null
@@ -1 +0,0 @@
-../sims/firesim/sw/firesim-software/
\ No newline at end of file
diff --git a/software/firemarshal b/software/firemarshal
new file mode 160000
index 00000000..ef2d467f
--- /dev/null
+++ b/software/firemarshal
@@ -0,0 +1 @@
+Subproject commit ef2d467fe214d4d5294681ee8a3b25c3f470ea6b