From f01101da4b841c5d54dbd9517f3e5a07f786d139 Mon Sep 17 00:00:00 2001
From: Jerry Zhao <jerryz123@berkeley.edu>
Date: Wed, 3 May 2023 18:36:08 -0700
Subject: [PATCH] Remove init-fpga scripts and references, init-submodules now
 also inits-fpga

---
 .github/scripts/remote-do-rtl-build.sh |  2 --
 docs/Prototyping/General.rst           |  9 +--------
 scripts/build-setup.sh                 |  1 -
 scripts/init-fpga.sh                   | 12 ------------
 4 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100755 scripts/init-fpga.sh

diff --git a/.github/scripts/remote-do-rtl-build.sh b/.github/scripts/remote-do-rtl-build.sh
index 445c1c31eb..06b47ba213 100755
--- a/.github/scripts/remote-do-rtl-build.sh
+++ b/.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
diff --git a/docs/Prototyping/General.rst b/docs/Prototyping/General.rst
index 89c0b51289..2b7a7332b0 100644
--- a/docs/Prototyping/General.rst
+++ b/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
 ----------------------
diff --git a/scripts/build-setup.sh b/scripts/build-setup.sh
index 262b3a19bc..a09f43599e 100755
--- a/scripts/build-setup.sh
+++ b/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)
diff --git a/scripts/init-fpga.sh b/scripts/init-fpga.sh
deleted file mode 100755
index 0182bd4b74..0000000000
--- a/scripts/init-fpga.sh
+++ /dev/null
@@ -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