From f7790c8bee3aac016bbe9569d1dd8b0fda2ac5e1 Mon Sep 17 00:00:00 2001
From: Jerry Zhao <jerryz123@berkeley.edu>
Date: Sat, 27 Jan 2024 19:49:42 -0800
Subject: [PATCH] Bump testchipip

---
 fpga/Makefile                                      | 14 --------------
 .../src/main/scala/harness/HarnessBinders.scala    |  3 +--
 .../main/scala/harness/MultiHarnessBinders.scala   |  6 ++----
 generators/testchipip                              |  2 +-
 4 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/fpga/Makefile b/fpga/Makefile
index a4d3bf99..ebf55a97 100644
--- a/fpga/Makefile
+++ b/fpga/Makefile
@@ -44,20 +44,6 @@ ifeq ($(SUB_PROJECT),vcu118)
 	FPGA_BRAND        ?= xilinx
 endif
 
-ifeq ($(SUB_PROJECT),bringup)
-	SBT_PROJECT       ?= fpga_platforms
-	MODEL             ?= BringupVCU118FPGATestHarness
-	VLOG_MODEL        ?= BringupVCU118FPGATestHarness
-	MODEL_PACKAGE     ?= chipyard.fpga.vcu118.bringup
-	CONFIG            ?= RocketBringupConfig
-	CONFIG_PACKAGE    ?= chipyard.fpga.vcu118.bringup
-	GENERATOR_PACKAGE ?= chipyard
-	TB                ?= none # unused
-	TOP               ?= ChipTop
-	BOARD             ?= vcu118
-	FPGA_BRAND        ?= xilinx
-endif
-
 ifeq ($(SUB_PROJECT),nexysvideo)
 	SBT_PROJECT       ?= fpga_platforms
 	MODEL             ?= NexysVideoHarness
diff --git a/generators/chipyard/src/main/scala/harness/HarnessBinders.scala b/generators/chipyard/src/main/scala/harness/HarnessBinders.scala
index d46225ae..74d2e4ac 100644
--- a/generators/chipyard/src/main/scala/harness/HarnessBinders.scala
+++ b/generators/chipyard/src/main/scala/harness/HarnessBinders.scala
@@ -213,8 +213,7 @@ class WithSerialTLTiedOff(tieoffs: Option[Seq[Int]] = None) extends HarnessBinde
       case io: SourceSyncPhitIO => {
         io.clock_in := false.B.asClock
         io.reset_in := false.B.asAsyncReset
-        io.phit_in := DontCare
-        io.credit_in := DontCare
+        io.in := DontCare
       }
     }
     port.io match {
diff --git a/generators/chipyard/src/main/scala/harness/MultiHarnessBinders.scala b/generators/chipyard/src/main/scala/harness/MultiHarnessBinders.scala
index 94fb18d9..55ff4191 100644
--- a/generators/chipyard/src/main/scala/harness/MultiHarnessBinders.scala
+++ b/generators/chipyard/src/main/scala/harness/MultiHarnessBinders.scala
@@ -69,10 +69,8 @@ class WithMultiChipSerialTL(chip0: Int, chip1: Int, chip0portId: Int = 0, chip1p
       b.clock_in := a.clock_out
       a.reset_in := b.reset_out
       b.reset_in := a.reset_out
-      a.phit_in := b.phit_out
-      b.phit_in := a.phit_out
-      a.credit_in := b.credit_out
-      b.credit_in := a.credit_out
+      a.in := b.out
+      b.in := a.out
     }
     (p0.io, p1.io) match {
       case (io0: InternalSyncPhitIO, io1: ExternalSyncPhitIO) => connectDecoupledSyncPhitIO(io0, io1)
diff --git a/generators/testchipip b/generators/testchipip
index ec83e5eb..6ac7976b 160000
--- a/generators/testchipip
+++ b/generators/testchipip
@@ -1 +1 @@
-Subproject commit ec83e5eb9247b2ce2dde9beaa55a2168ac6caf14
+Subproject commit 6ac7976b215ac4c372ffe9528626b504aafb680b