From 68b2da6b3a8e03f6fba8e50a195032df1a6a2fe8 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Wed, 17 Apr 2019 16:06:42 -0700 Subject: [PATCH] update boom | match build.sbt --- build.sbt | 6 +++--- generators/boom | 2 +- variables.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index a251d86d..52de1ba5 100644 --- a/build.sbt +++ b/build.sbt @@ -24,9 +24,6 @@ lazy val rocketchip = RootProject(file("generators/rocket-chip")) lazy val testchipip = (project in file("generators/testchipip")).settings(commonSettings) .dependsOn(rocketchip) -lazy val boom = (project in file("generators/boom")).settings(commonSettings) - .dependsOn(rocketchip) - // Checks for -DROCKET_USE_MAVEN. // If it's there, use a maven dependency. // Else, depend on subprojects in git submodules. @@ -42,6 +39,9 @@ def conditionalDependsOn(prj: Project): Project = { lazy val example = conditionalDependsOn(project in file(".")) .settings(commonSettings) +lazy val boom = conditionalDependsOn(project in file("generators/boom")) + .settings(commonSettings) + lazy val tapeout = conditionalDependsOn(project in file("./tools/barstools/tapeout/")) .settings(commonSettings) diff --git a/generators/boom b/generators/boom index c7489137..f1caea81 160000 --- a/generators/boom +++ b/generators/boom @@ -1 +1 @@ -Subproject commit c7489137d420b5095a78ab6c64ded56a4581397a +Subproject commit f1caea81c6daa183c8a9fc82d2a5dee1625640ad diff --git a/variables.mk b/variables.mk index c944af1c..f57abead 100644 --- a/variables.mk +++ b/variables.mk @@ -5,7 +5,7 @@ ######################################################################################### # default variables to invoke the generator # descriptions: -# PROJECT = the scala package to find the MODEL in +# PROJECT = the scala package to find the MODEL/Generator in # MODEL = the top level module of the project (normally the harness) # CONFIG = the configuration class to give the parameters for the project # CFG_PROJECT = the scala package to find the CONFIG class