wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into local-chisel34

Browse Source
This commit is contained in:
abejgonzalez
2020-11-15 16:03:25 -08:00
parent 1110dd702c f54dce13d6
commit 9ea23d43a7
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
generators/chipyard/src/main/scala/CustomBusTopologies.scala
View File

@@ -54,9 +54,9 @@ case class HierarchicalMulticlockBusTopologyParams(
(FBUS, fbus), (FBUS, fbus),
(CBUS, cbus)), (CBUS, cbus)),
connections = List( connections = List(
(SBUS, CBUS, TLBusWrapperConnection(xType = xTypes.sbusToCbusXType, nodeBinding = BIND_STAR)()), (SBUS, CBUS, TLBusWrapperConnection. crossTo(xType = xTypes.sbusToCbusXType, driveClockFromMaster = None)),
(CBUS, PBUS, TLBusWrapperConnection(xType = xTypes.cbusToPbusXType, nodeBinding = BIND_STAR)()), (CBUS, PBUS, TLBusWrapperConnection. crossTo(xType = xTypes.cbusToPbusXType, driveClockFromMaster = None)),
(FBUS, SBUS, TLBusWrapperConnection(xType = xTypes.fbusToSbusXType, nodeBinding = BIND_QUERY, flipRendering = true)())) (FBUS, SBUS, TLBusWrapperConnection.crossFrom(xType = xTypes.fbusToSbusXType, driveClockFromMaster = None)))
) )
// For subsystem/Configs.scala // For subsystem/Configs.scala

23
scripts/build-toolchains.sh
View File

@@ -20,6 +20,7 @@ usage() {
echo "Options" echo "Options"
echo " --prefix PREFIX : Install destination. If unset, defaults to $(pwd)/riscv-tools-install" echo " --prefix PREFIX : Install destination. If unset, defaults to $(pwd)/riscv-tools-install"
echo " or $(pwd)/esp-tools-install" echo " or $(pwd)/esp-tools-install"
echo " --ignore-qemu : Ignore installing QEMU"
echo " --help -h : Display this message" echo " --help -h : Display this message"
exit "$1" exit "$1"
} }
@@ -34,6 +35,7 @@ die() {
TOOLCHAIN="riscv-tools" TOOLCHAIN="riscv-tools"
EC2FASTINSTALL="false" EC2FASTINSTALL="false"
IGNOREQEMU=""
RISCV="" RISCV=""
# getopts does not support long options, and is inflexible # getopts does not support long options, and is inflexible
@@ -45,6 +47,9 @@ do
-p | --prefix ) -p | --prefix )
shift shift
RISCV=$(realpath $1) ;; RISCV=$(realpath $1) ;;
--ignore-qemu )
shift
IGNOREQEMU="true" ;;
riscv-tools | esp-tools) riscv-tools | esp-tools)
TOOLCHAIN=$1 ;; TOOLCHAIN=$1 ;;
ec2fast ) ec2fast )
@@ -102,12 +107,16 @@ if [ "${EC2FASTINSTALL}" = true ] ; then
git submodule deinit "${module}" || : git submodule deinit "${module}" || :
else else
"${MAKE}" --version | ( MAKE_VER=$("${MAKE}" --version) || true
read -r makever case ${MAKE_VER} in
case ${makever} in 'GNU Make '[4-9]\.*)
'GNU Make '[4-9]\.*|'GNU Make '[1-9][0-9]) ;; ;;
*) false ;; 'GNU Make '[1-9][0-9])
esac; ) || die 'obsolete make version; need GNU make 4.x or later' ;;
*)
die 'obsolete make version; need GNU make 4.x or later'
;;
esac
module_prepare riscv-gnu-toolchain qemu module_prepare riscv-gnu-toolchain qemu
module_build riscv-gnu-toolchain --prefix="${RISCV}" --with-cmodel=medany module_build riscv-gnu-toolchain --prefix="${RISCV}" --with-cmodel=medany
@@ -128,7 +137,9 @@ module_all riscv-tests --prefix="${RISCV}/riscv64-unknown-elf"
SRCDIR="$(pwd)/toolchains" module_all libgloss --prefix="${RISCV}/riscv64-unknown-elf" --host=riscv64-unknown-elf SRCDIR="$(pwd)/toolchains" module_all libgloss --prefix="${RISCV}/riscv64-unknown-elf" --host=riscv64-unknown-elf
if [ -z "$IGNOREQEMU" ] ; then
SRCDIR="$(pwd)/toolchains" module_all qemu --prefix="${RISCV}" --target-list=riscv64-softmmu SRCDIR="$(pwd)/toolchains" module_all qemu --prefix="${RISCV}" --target-list=riscv64-softmmu
fi
# make Dromajo # make Dromajo
git submodule update --init $CHIPYARD_DIR/tools/dromajo/dromajo-src git submodule update --init $CHIPYARD_DIR/tools/dromajo/dromajo-src

2
tools/dromajo/dromajo-src

Submodule tools/dromajo/dromajo-src updated: 56e2ff46b7...09fbef4565