From 1dfe9b1c9f128be8e229c9688512252f47c2da18 Mon Sep 17 00:00:00 2001
From: Howard Mao <zhehao.mao@gmail.com>
Date: Fri, 23 Feb 2018 11:46:40 -0800
Subject: [PATCH] bump rocket-chip and fix deprecated code in
 testchipip.GeneratorApp

---
 Makefrag    | 2 +-
 rocket-chip | 2 +-
 testchipip  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefrag b/Makefrag
index 7442d73f..6e138e75 100644
--- a/Makefrag
+++ b/Makefrag
@@ -38,7 +38,7 @@ CHISEL_ARGS ?=
 
 $(build_dir)/$(PROJECT).$(MODEL).$(CONFIG).fir: $(rocketchip_stamp) $(extra_stamps) $(call lookup_scala_srcs,$(base_dir)/src/main/scala) $(bootrom_img)
 	mkdir -p $(build_dir)
-	cd $(base_dir) && $(SBT) "run-main $(PROJECT).Generator $(CHISEL_ARGS) $(build_dir) $(PROJECT) $(MODEL) $(CFG_PROJECT) $(CONFIG)"
+	cd $(base_dir) && $(SBT) "runMain $(PROJECT).Generator $(CHISEL_ARGS) $(build_dir) $(PROJECT) $(MODEL) $(CFG_PROJECT) $(CONFIG)"
 
 $(build_dir)/$(PROJECT).$(MODEL).$(CONFIG).v: $(build_dir)/$(PROJECT).$(MODEL).$(CONFIG).fir $(FIRRTL_JAR)
 	$(FIRRTL) -i $< -o $@ -X verilog
diff --git a/rocket-chip b/rocket-chip
index 8799508b..69b48b62 160000
--- a/rocket-chip
+++ b/rocket-chip
@@ -1 +1 @@
-Subproject commit 8799508b1f374b7fe8086c46228f08fd2095d0df
+Subproject commit 69b48b623ab8c37e822f29e4a4a74a4944b12bd0
diff --git a/testchipip b/testchipip
index f8d7bed3..3cd6ece8 160000
--- a/testchipip
+++ b/testchipip
@@ -1 +1 @@
-Subproject commit f8d7bed3e51b4ef5cd572a7cd4b4ca346fea2896
+Subproject commit 3cd6ece8739eb228a5c345a7e6b826540dfb79b0