From 08089f695d80c141a6789312a373ad46a44cf511 Mon Sep 17 00:00:00 2001
From: Howard Mao <zhehao.mao@gmail.com>
Date: Thu, 1 Sep 2016 10:28:07 -0700
Subject: [PATCH] allow configuration to be in separate project from test
 harness

---
 Makefrag                    | 1 +
 emulator/Makefrag-verilator | 4 ++--
 vsim/Makefrag-verilog       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefrag b/Makefrag
index b6acebae..a8335606 100644
--- a/Makefrag
+++ b/Makefrag
@@ -5,6 +5,7 @@ endif
 
 MODEL ?= TestHarness
 PROJECT := rocketchip
+CFG_PROJECT := $(PROJECT)
 CXX ?= g++
 CXXFLAGS := -O1
 
diff --git a/emulator/Makefrag-verilator b/emulator/Makefrag-verilator
index 30e07acf..a31d2819 100644
--- a/emulator/Makefrag-verilator
+++ b/emulator/Makefrag-verilator
@@ -11,11 +11,11 @@ verilog_debug = $(generated_dir_debug)/$(MODEL).$(CONFIG).v
 
 $(generated_dir)/%.$(CONFIG).fir $(generated_dir)/%.$(CONFIG).prm $(generated_dir)/%.$(CONFIG).d: $(chisel_srcs) $(bootrom_img)
 	mkdir -p $(dir $@)
-	cd $(base_dir) && $(SBT) "run $(generated_dir) $(PROJECT) $(MODEL) $(PROJECT) $(CONFIG)"
+	cd $(base_dir) && $(SBT) "run $(generated_dir) $(PROJECT) $(MODEL) $(CFG_PROJECT) $(CONFIG)"
 
 $(generated_dir_debug)/%.$(CONFIG).fir $(generated_dir_debug)/%.$(CONFIG).prm $(generated_dir_debug)/%.$(CONFIG).d: $(chisel_srcs) $(bootrom_img)
 	mkdir -p $(dir $@)
-	cd $(base_dir) && $(SBT) "run $(generated_dir_debug) $(PROJECT) $(MODEL) $(PROJECT) $(CONFIG)"
+	cd $(base_dir) && $(SBT) "run $(generated_dir_debug) $(PROJECT) $(MODEL) $(CFG_PROJECT) $(CONFIG)"
 
 %.v: %.fir $(FIRRTL_JAR)
 	mkdir -p $(dir $@)
diff --git a/vsim/Makefrag-verilog b/vsim/Makefrag-verilog
index 2f49ff3d..6774a309 100644
--- a/vsim/Makefrag-verilog
+++ b/vsim/Makefrag-verilog
@@ -7,7 +7,7 @@
 
 $(generated_dir)/%.$(CONFIG).fir $(generated_dir)/%.$(CONFIG).d $(generated_dir)/%.prm: $(chisel_srcs) $(bootrom_img)
 	mkdir -p $(dir $@)
-	cd $(base_dir) && $(SBT) "run $(generated_dir) $(PROJECT) $(notdir $*) $(PROJECT) $(CONFIG)"
+	cd $(base_dir) && $(SBT) "run $(generated_dir) $(PROJECT) $(notdir $*) $(CFG_PROJECT) $(CONFIG)"
 
 $(generated_dir)/%.v: $(generated_dir)/%.fir $(FIRRTL_JAR)
 	mkdir -p $(dir $@)