Merge pull request #1456 from ucb-bar/jerryz123-patch-2

Always initialize fpga-shells with init-submodules.sh

.github/scripts/remote-do-rtl-build.sh

@@ -16,8 +16,6 @@ source $SCRIPT_DIR/defaults.sh
 
 cd $REMOTE_CHIPYARD_DIR
 ./scripts/init-submodules-no-riscv-tools.sh --force
-./scripts/init-fpga.sh
-
 
 # Constellation can run without espresso, but this improves
 # elaboration time drastically

docs/Prototyping/General.rst

@@ -1,18 +1,11 @@
 General Setup and Usage
 ==============================
 
-Sources and Submodule Setup
+Sources
 ---------------------------
 
 All FPGA prototyping-related collateral and sources are located in the ``fpga`` top-level Chipyard directory.
 This includes the ``fpga-shells`` submodule and the ``src`` directory that hold both Scala, TCL and other collateral.
-However, the ``fpga-shells`` submodule repository is not initialized by default.
-To initialize the ``fpga-shells`` submodule repository, run the included initialization script from the Chipyard top-level directory:
-
-.. code-block:: shell
-
-    # in the chipyard top level folder
-    ./scripts/init-fpga.sh
 
 Generating a Bitstream
 ----------------------

scripts/build-setup.sh

@@ -138,7 +138,6 @@ fi
 # initialize all submodules (without the toolchain submodules)
 if run_step "2"; then
     $CYDIR/scripts/init-submodules-no-riscv-tools.sh $FORCE_FLAG
-    $CYDIR/scripts/init-fpga.sh $FORCE_FLAG
 fi
 
 # build extra toolchain collateral (i.e. spike, pk, riscv-tests, libgloss)

scripts/init-fpga.sh

@@ -1,12 +0,0 @@
-#!/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

@@ -107,8 +107,7 @@ cd "$RDIR"
             software/coremark \
             software/firemarshal \
             software/spec2017 \
-            vlsi/hammer-mentor-plugins \
-            fpga/fpga-shells
+            vlsi/hammer-mentor-plugins
         do
             "$1" "${name%/}"
         done