Merge remote-tracking branch 'origin/dev' into hammer-docs

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
@@ -39,6 +39,8 @@ 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
+# Disable update to fpga-shells
+git config submodule.fpga/fpga-shells.update none
 git submodule update --init --recursive #--jobs 8
 
 # Un-ignore toolchain submodules

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)