From f27845e15ed71bf2628c4dbc4767e4905aaa46f2 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Wed, 22 Feb 2023 22:07:05 -0800 Subject: [PATCH 1/2] Fix Chisel hierarchy API - Fixes #1356 --- build.sbt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index e8f999c005..1b8e90b399 100644 --- a/build.sbt +++ b/build.sbt @@ -12,7 +12,10 @@ lazy val commonSettings = Seq( assembly / assemblyMergeStrategy := { _ match { case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard case _ => MergeStrategy.first}}, - scalacOptions ++= Seq("-deprecation","-unchecked"), + scalacOptions ++= Seq( + "-deprecation", + "-unchecked", + "-Ymacro-annotations"), // fix hierarchy API unmanagedBase := (chipyardRoot / unmanagedBase).value, allDependencies := { // drop specific maven dependencies in subprojects in favor of Chipyard's version From 63a7d13ec7cebd8c211280cb257a7d8b70bdc1b0 Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Thu, 23 Feb 2023 10:12:03 -0800 Subject: [PATCH 2/2] Fix newline in message in build-setup.sh --- scripts/build-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-setup.sh b/scripts/build-setup.sh index 7f14a738e7..aa78942bba 100755 --- a/scripts/build-setup.sh +++ b/scripts/build-setup.sh @@ -91,7 +91,7 @@ run_step() { # Check for this, since many users will be attempting to use this with gemmini if [ $TOOLCHAIN_TYPE == "esp-tools" ]; then while true; do - read -p "WARNING: You are trying to install the esp-tools toolchain."$'n'"This should ONLY be used for Hwacha development."$'\n'"Gemmini should be used with riscv-tools."$'\n'"Type \"y\" to continue if this is intended, or \"n\" if not: " validate + read -p "WARNING: You are trying to install the esp-tools toolchain."$'\n'"This should ONLY be used for Hwacha development."$'\n'"Gemmini should be used with riscv-tools."$'\n'"Type \"y\" to continue if this is intended, or \"n\" if not: " validate case "$validate" in y | Y) echo "Installing esp-tools."