From c65c255815c3729ff58306acf8643aab53329045 Mon Sep 17 00:00:00 2001
From: Henry Cook <henry@sifive.com>
Date: Tue, 22 Nov 2016 10:53:44 -0800
Subject: [PATCH] [coreplex] TileId moved to groundtest

---
 src/main/scala/groundtest/Coreplex.scala | 3 ++-
 src/main/scala/rocket/tile.scala         | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/groundtest/Coreplex.scala b/src/main/scala/groundtest/Coreplex.scala
index 23529037..1abb2a32 100644
--- a/src/main/scala/groundtest/Coreplex.scala
+++ b/src/main/scala/groundtest/Coreplex.scala
@@ -6,9 +6,10 @@ import diplomacy._
 import coreplex._
 import uncore.devices.NTiles
 import uncore.tilelink2._
-import rocket.TileId
 import uncore.tilelink.TLId
 
+case object TileId extends Field[Int]
+
 class GroundTestCoreplex(implicit p: Parameters) extends BaseCoreplex {
   val tiles = List.tabulate(p(NTiles)) { i =>
     LazyModule(new GroundTestTile()(p.alterPartial({
diff --git a/src/main/scala/rocket/tile.scala b/src/main/scala/rocket/tile.scala
index e0b7a585..259ada1b 100644
--- a/src/main/scala/rocket/tile.scala
+++ b/src/main/scala/rocket/tile.scala
@@ -14,7 +14,6 @@ import config._
 import scala.collection.mutable.ListBuffer
 
 case object BuildRoCC extends Field[Seq[RoccParameters]]
-case object TileId extends Field[Int]
 
 case class RoccParameters(
   opcodes: OpcodeSet,
@@ -30,7 +29,6 @@ class RocketTile(tileId: Int)(implicit p: Parameters) extends LazyModule {
   val dcacheParams = coreParams.alterPartial({
     case CacheName => CacheName("L1D")
     case TLId => "L1toL2"
-    case TileId => tileId // TODO using this messes with Heirarchical P&R: change to io.hartid?
   })
   val icacheParams = coreParams.alterPartial({
     case CacheName => CacheName("L1I")