Merge pull request #338 from riscv-boom/ci-update

CI Hwacha Support
riscv-boom · Oct 21, 2019 · e2814ef · e2814ef
2 parents 93898ff + 1939935
commit e2814ef
Show file tree

Hide file tree

Showing 9 changed files with 271 additions and 58 deletions.
diff --git a/.circleci/build-riscv-tools.sh → .circleci/build-toolchains.sh b/.circleci/build-riscv-tools.sh → .circleci/build-toolchains.sh
@@ -9,7 +9,7 @@ set -ex
 SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 source $SCRIPT_DIR/defaults.sh
 
-if [ ! -d "$LOCAL_RISCV_DIR" ]; then
+if [ ! -d "$HOME/$1-install" ]; then
     cd $HOME
 
     git clone --progress --verbose https://github.com/ucb-bar/chipyard.git chipyard
@@ -19,7 +19,8 @@ if [ ! -d "$LOCAL_RISCV_DIR" ]; then
     git fetch
     git checkout $(cat $LOCAL_CHECKOUT_DIR/CHIPYARD.hash)
 
-    git submodule update --init --recursive toolchains/riscv-tools
-    cd toolchains/riscv-tools
-    ./build.sh
+    cd $HOME
+
+    # init all submodules including the tools
+    CHIPYARD_DIR="$LOCAL_CHIPYARD_DIR" NPROC=2 $LOCAL_CHIPYARD_DIR/scripts/build-toolchains.sh $1
 fi