From 401a2b9da45985d4dde7d60a6c0c8bc0bc612547 Mon Sep 17 00:00:00 2001 From: David Biancolin Date: Wed, 29 May 2019 15:31:33 +0000 Subject: [PATCH] Update setup scripts --- scripts/firesim-setup.sh | 4 +++- scripts/init-submodules-no-riscv-tools.sh | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/firesim-setup.sh b/scripts/firesim-setup.sh index e7596a96..53dee5ab 100755 --- a/scripts/firesim-setup.sh +++ b/scripts/firesim-setup.sh @@ -7,8 +7,10 @@ set -o pipefail RDIR=$(pwd) scripts_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -sims_dir=$(scripts_dir)/../sims/ +sims_dir=$scripts_dir/../sims/ +# Reenable the FireSim submodule +git config --unset submodule.sims/firesim.update || true cd $sims_dir git submodule update --init firesim cd firesim diff --git a/scripts/init-submodules-no-riscv-tools.sh b/scripts/init-submodules-no-riscv-tools.sh index 27005cbb..ee5a6bb0 100755 --- a/scripts/init-submodules-no-riscv-tools.sh +++ b/scripts/init-submodules-no-riscv-tools.sh @@ -13,6 +13,8 @@ RDIR=$(pwd) git config --global submodule.riscv-tools.update none git config --global submodule.esp-tools.update none git config --global submodule.experimental-blocks.update none +# Disable updates to the FireSim submodule until explicitly requested +git config submodule.sims/firesim.update none git submodule update --init --recursive #--jobs 8 # unignore riscv-tools,catapult-shell2 globally git config --global --unset submodule.riscv-tools.update