replica
/
hqjenny-chipyard
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

revert condDependsOn | put new firrtl jar into rocket

This commit is contained in:
abejgonzalez 2019-04-18 11:39:19 -07:00
parent 739fcec160
commit 7faaa56f34
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sbt
View File

@ -31,7 +31,7 @@ lazy val testchipip = (project in file("generators/testchipip"))
// Checks for -DROCKET_USE_MAVEN.
// If it's there, use a maven dependency.
// Else, depend on subprojects in git submodules.
def testchipIpDependsOn(prj: Project): Project = {
def conditionalDependsOn(prj: Project): Project = {
if (sys.props.contains("ROCKET_USE_MAVEN")) {
prj.settings(Seq(
libraryDependencies += "edu.berkeley.cs" %% "testchipip" % "1.0-020719-SNAPSHOT",
@ -41,7 +41,7 @@ def testchipIpDependsOn(prj: Project): Project = {
}
}
lazy val example = testchipIpDependsOn(project in file("."))
lazy val example = conditionalDependsOn(project in file("."))
.settings(commonSettings)
lazy val boom = (project in file("generators/boom"))

9
common.mk
View File

@ -20,13 +20,12 @@ TESTCHIPIP_CLASSES ?= "$(TESTCHIP_DIR)/target/scala-$(SCALA_VERSION_MAJOR)/class
#########################################################################################
# jar creation variables and rules
#########################################################################################
FIRRTL_DIR = $(base_dir)/tools/firrtl
FIRRTL_JAR ?= $(base_dir)/lib/firrtl.jar
FIRRTL_JAR ?= $(ROCKETCHIP_DIR)/lib/firrtl.jar
$(FIRRTL_JAR): $(call lookup_scala_srcs, $(FIRRTL_DIR)/firrtl/src/main/scala)
$(MAKE) -C $(FIRRTL_DIR) SBT="$(SBT)" root_dir=$(FIRRTL_DIR) build-scala
$(FIRRTL_JAR): $(call lookup_scala_srcs, $(REBAR_FIRRTL_DIR)/src/main/scala)
$(MAKE) -C $(REBAR_FIRRTL_DIR) SBT="$(SBT)" root_dir=$(REBAR_FIRRTL_DIR) build-scala
mkdir -p $(dir $@)
cp -p $(FIRRTL_DIR)/utils/bin/firrtl.jar $@
cp -p $(REBAR_FIRRTL_DIR)/utils/bin/firrtl.jar $@
touch $@
#########################################################################################

5
variables.mk
View File

@ -34,8 +34,9 @@ endif
#########################################################################################
# path to rocket-chip and testchipip
#########################################################################################
ROCKETCHIP_DIR = $(base_dir)/generators/rocket-chip
TESTCHIP_DIR = $(base_dir)/generators/testchipip
ROCKETCHIP_DIR = $(base_dir)/generators/rocket-chip
TESTCHIP_DIR = $(base_dir)/generators/testchipip
REBAR_FIRRTL_DIR = $(base_dir)/tools/firrtl
#########################################################################################
# names of various files needed to compile and run things