Merging with current changes

deploy/support/default-config.yaml

@@ -1,5 +1,5 @@
 # Path to the chipyard repository to use when generating hardware
-chipyard-dir: '../../../../'
+chipyard-dir: '/scratch/qijing.huang/chipyard'
 
 # Directory to store runtime logs in
 log-dir: '../logs'

deploy/support/templates/build_sbt_template

@@ -230,12 +230,6 @@ lazy val iocell = Project(id = "iocell", base = file("./tools/barstools/") / "sr
   .settings(chiselSettings)
   .settings(commonSettings)
 
-lazy val tapeout = (project in file("./tools/barstools/"))
-  .settings(chiselSettings)
-  .settings(chiselTestSettings)
-  .enablePlugins(sbtassembly.AssemblyPlugin)
-  .settings(commonSettings)
-
 lazy val dsptools = freshProject("dsptools", file("./tools/dsptools"))
   .settings(
     chiselSettings,

scripts/generate_config.pl

@@ -51,7 +51,7 @@ class WithHLSRoCCExample extends Config((site, here, up) => {
         $rocc .= "\n})\n";
     #}
 
-    open CONFIG, ">$rdir/generators/example/src/main/scala/HLSConfig.scala" or die "$!\n";
+    open CONFIG, ">$rdir/generators/chipyard/src/main/scala/config/HLSConfig.scala" or die "$!\n";
     my $config="package example
 import chisel3._
 import freechips.rocketchip.diplomacy.{LazyModule, ValName}