Merge remote-tracking branch 'origin/dev' into package-rename

This commit is contained in:
Jerry Zhao
2020-02-23 23:04:50 -08:00
5 changed files with 5 additions and 5 deletions

View File

@@ -32,7 +32,7 @@ class FireSim(implicit val p: Parameters) extends RawModule {
//
// Apply each partial function to each DUT instance
for ((target) <- targets) {
p(IOBinders).values.map(fn => fn(false.B, target))
p(IOBinders).values.map(fn => fn(clock, reset.asBool, false.B, target))
}
}
}

View File

@@ -141,5 +141,5 @@ cd "$RDIR"
} > env-$TOOLCHAIN.sh
# create general env.sh
echo "source \$( realpath \$(dirname "\${BASH_SOURCE[0]}") )/env-$TOOLCHAIN.sh" >> env.sh
echo "source \$( realpath \$(dirname "\${BASH_SOURCE[0]:-\${\(%\):-%x}}") )/env-$TOOLCHAIN.sh" >> env.sh
echo "Toolchain Build Complete!"

View File

@@ -6,7 +6,7 @@ set -e
set -o pipefail
RDIR=$(pwd)
scripts_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
scripts_dir="$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" >/dev/null 2>&1 && pwd )"
cd "${scripts_dir}/.."

View File

@@ -60,4 +60,4 @@ git submodule update --init software/firemarshal
if [ ! -f $RDIR/software/firemarshal/marshal-config.yaml ]; then
echo "firesim-dir: '../../sims/firesim/'" > $RDIR/software/firemarshal/marshal-config.yaml
fi
echo "PATH=\$( realpath \$(dirname "\${BASH_SOURCE[0]}") )/software/firemarshal:\$PATH" >> $RDIR/env.sh
echo "PATH=\$( realpath \$(dirname "\${BASH_SOURCE[0]:-\${\(%\):-%x}}") )/software/firemarshal:\$PATH" >> $RDIR/env.sh