Bump FireMarshal to get better submodule handling. Specifically, marshal

is no longer initialized recursively by default (you have to manually
./init-submodules.sh)
This commit is contained in:
Nathan Pemberton 2019-11-12 17:17:05 -05:00
parent 9d80792262
commit e57b4ede73
3 changed files with 9 additions and 2 deletions

View File

@ -63,8 +63,14 @@ done
# Disable the REBAR submodule initially, and enable if we're not in library mode # Disable the REBAR submodule initially, and enable if we're not in library mode
git config submodule.target-design/chipyard.update none git config submodule.target-design/chipyard.update none
git config submodule.sw/firesim-software.update none
git submodule update --init --recursive #--jobs 8 git submodule update --init --recursive #--jobs 8
# firesim-software should not be recursively initialized by default (use
# sw/firesim-software/init-submodules.sh if you need linux deps)
git config --unset submodule.sw/firesim-software.update
git submodule update --init sw/firesim-software
if [ "$IS_LIBRARY" = false ]; then if [ "$IS_LIBRARY" = false ]; then
git config --unset submodule.target-design/chipyard.update git config --unset submodule.target-design/chipyard.update
git submodule update --init target-design/chipyard git submodule update --init target-design/chipyard

View File

@ -13,4 +13,5 @@ make f1
# build target software # build target software
cd ../sw/firesim-software cd ../sw/firesim-software
./marshal -v build workloads/br-base.json ./init-submodules.sh
./marshal -v build br-base.json

@ -1 +1 @@
Subproject commit 12791ee8e51740d67796c0a9bfd6a714f8217cb5 Subproject commit 92930cf52174b08695ffe9e5750f7575db42b9e1