fixed merge conflict

scripts/build-toolchains.sh

@@ -135,7 +135,7 @@ module_all riscv-tests --prefix="${RISCV}/riscv64-unknown-elf"
 
 # Common tools (not in any particular toolchain dir)
 
-SRCDIR="$(pwd)/toolchains" module_all libgloss --prefix="${RISCV}/riscv64-unknown-elf" --host=riscv64-unknown-elf
+CC= CXX= SRCDIR="$(pwd)/toolchains" module_all libgloss --prefix="${RISCV}/riscv64-unknown-elf" --host=riscv64-unknown-elf
 
 if [ -z "$IGNOREQEMU" ] ; then
 SRCDIR="$(pwd)/toolchains" module_all qemu --prefix="${RISCV}" --target-list=riscv64-softmmu

scripts/init-fpga.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+# exit script if any command fails
+set -e
+set -o pipefail
+
+# Enable submodule update for FPGA tools.
+git config --unset submodule.fpga/fpga-shells.update || :
+# Initialize local FPGA tools.
+git submodule update --init --recursive fpga/fpga-shells
+# Disable submodule update for FPGA tools.
+git config submodule.fpga/fpga-shells.update none

scripts/init-submodules-no-riscv-tools-nolog.sh

@@ -11,7 +11,7 @@ case ${MYGIT} in
 [1-9]*) ;;
 *) echo 'warning: unknown git version' ;;
 esac
-MINGIT="1.7.8"
+MINGIT="1.8.5"
 if [ "$MINGIT" != "$(echo -e "$MINGIT\n$MYGIT" | sort -V | head -n1)" ]; then
   echo "This script requires git version $MINGIT or greater. Exiting."
   false
@@ -20,41 +20,41 @@ fi
 DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
 CHIPYARD_DIR="$(dirname "$DIR")"
 
-# Ignore toolchain submodules
 cd "$CHIPYARD_DIR"
-for name in toolchains/*-tools/*/ ; do
-    git config submodule."${name%/}".update none
-done
-git config submodule.toolchains/libgloss.update none
-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
-git config submodule.generators/gemmini.update none
+(
+    # Blocklist of submodules to initially skip:
+    # - Toolchain submodules
+    # - Generators with huge submodules (e.g., linux sources)
+    # - FireSim until explicitly requested
+    # - Hammer tool plugins
+    git_submodule_exclude() {
+        # Call the given subcommand (shell function) on each submodule
+        # path to temporarily exclude during the recursive update
+        for name in \
+            toolchains/*-tools/*/ \
+            toolchains/libgloss \
+            toolchains/qemu \
+            generators/sha3 \
+            generators/gemmini \
+            sims/firesim \
+            vlsi/hammer-cadence-plugins \
+            vlsi/hammer-synopsys-plugins \
+            vlsi/hammer-mentor-plugins \
+            software/firemarshal \
+            fpga/fpga-shells
+        do
+            "$1" "${name%/}"
+        done
+    }
 
-# Disable updates to the FireSim submodule until explicitly requested
-git config submodule.sims/firesim.update none
-# Disable updates to the hammer tool plugins repos
-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
+    _skip() { git config --local "submodule.${1}.update" none ; }
+    _unskip() { git config --local --unset-all "submodule.${1}.update" || : ; }
 
-# Un-ignore toolchain submodules
-for name in toolchains/*-tools/*/ ; do
-    git config --unset submodule."${name%/}".update
-done
-git config --unset submodule.toolchains/libgloss.update
-git config --unset submodule.toolchains/qemu.update
-
-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
-git config --unset submodule.generators/gemmini.update
-git config --unset submodule.software/firemarshal.update
+    trap 'git_submodule_exclude _unskip' EXIT INT TERM
+    git_submodule_exclude _skip
+    git submodule update --init --recursive #--jobs 8
+)
 
 # Non-recursive clone to exclude riscv-linux
 git submodule update --init generators/sha3
@@ -63,10 +63,9 @@ git submodule update --init generators/sha3
 git submodule update --init generators/gemmini
 git -C generators/gemmini/ submodule update --init --recursive software/gemmini-rocc-tests
 
-git config --unset submodule.sims/firesim.update
 # Minimal non-recursive clone to initialize sbt dependencies
 git submodule update --init sims/firesim
-git config submodule.sims/firesim.update none
+git config --local submodule.sims/firesim.update none
 
 # Only shallow clone needed for basic SW tests
 git submodule update --init software/firemarshal

scripts/tutorial-patches/build.sbt.patch

@@ -1,26 +1,30 @@
 diff --git a/build.sbt b/build.sbt
-index 5d642c1..56f6fda 100644
+index e80b2a5..b1989d9 100644
 --- a/build.sbt
 +++ b/build.sbt
-@@ -130,7 +130,7 @@ lazy val iocell = (project in file("./tools/barstools/iocell/"))
-
- lazy val chipyard = conditionalDependsOn(project in file("generators/chipyard"))
-   .dependsOn(boom, hwacha, sifive_blocks, sifive_cache, utilities, iocell,
+@@ -184,7 +184,7 @@ lazy val testchipipLib = "edu.berkeley.cs" %% "testchipip" % "1.0-020719-SNAPSHO
+ lazy val chipyard = (project in file("generators/chipyard"))
+   .sourceDependency(testchipip, testchipipLib)
+   .dependsOn(rocketchip, boom, hwacha, sifive_blocks, sifive_cache, utilities, iocell,
 -    sha3, // On separate line to allow for cleaner tutorial-setup patches
 +//    sha3, // On separate line to allow for cleaner tutorial-setup patches
      dsptools, `rocket-dsptools`,
      gemmini, icenet, tracegen, cva6, nvdla, sodor)
+   .settings(libraryDependencies ++= rocketLibDeps.value)
+@@ -227,11 +227,11 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
+   .settings(libraryDependencies ++= rocketLibDeps.value)
    .settings(commonSettings)
-@@ -158,9 +158,9 @@ lazy val cva6 = (project in file("generators/cva6"))
-   .dependsOn(rocketchip)
-   .settings(commonSettings)
-
+ 
 -lazy val sha3 = (project in file("generators/sha3"))
 -  .dependsOn(rocketchip, chisel_testers, midasTargetUtils)
+-  .settings(libraryDependencies ++= rocketLibDeps.value)
+-  .settings(libraryDependencies ++= chiselTestersLibDeps.value)
 -  .settings(commonSettings)
 +//lazy val sha3 = (project in file("generators/sha3"))
 +//  .dependsOn(rocketchip, chisel_testers, midasTargetUtils)
++//  .settings(libraryDependencies ++= rocketLibDeps.value)
++//  .settings(libraryDependencies ++= chiselTestersLibDeps.value)
 +//  .settings(commonSettings)
-
+ 
  lazy val gemmini = (project in file("generators/gemmini"))
-   .dependsOn(rocketchip, chisel_testers, testchipip)
+   .sourceDependency(testchipip, testchipipLib)