From 2976fd84e423c278748396b14cb679956f266a6f Mon Sep 17 00:00:00 2001
From: Henry Cook <henry@sifive.com>
Date: Fri, 18 Nov 2016 19:11:34 -0800
Subject: [PATCH] [rocket] resolve cde/config conflicts

---
 src/main/scala/rocket/HellaCache.scala          | 2 +-
 src/main/scala/rocket/ScratchpadSlavePort.scala | 2 +-
 src/main/scala/rocket/SimpleHellaCacheIF.scala  | 2 +-
 src/main/scala/rocket/dcache.scala              | 1 -
 src/main/scala/rocket/nbdcache.scala            | 1 -
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/rocket/HellaCache.scala b/src/main/scala/rocket/HellaCache.scala
index 0fed1211..eb1a91f9 100644
--- a/src/main/scala/rocket/HellaCache.scala
+++ b/src/main/scala/rocket/HellaCache.scala
@@ -3,7 +3,7 @@
 package rocket
 
 import Chisel._
-import cde.{Parameters, Field}
+import config.{Parameters, Field}
 import diplomacy._
 import uncore.tilelink2._
 import uncore.agents._
diff --git a/src/main/scala/rocket/ScratchpadSlavePort.scala b/src/main/scala/rocket/ScratchpadSlavePort.scala
index 41550633..b766082a 100644
--- a/src/main/scala/rocket/ScratchpadSlavePort.scala
+++ b/src/main/scala/rocket/ScratchpadSlavePort.scala
@@ -4,9 +4,9 @@ package rocket
 
 import Chisel._
 import Chisel.ImplicitConversions._
-import cde.Parameters
 import junctions._
 import diplomacy._
+import config._
 import uncore.constants._
 import uncore.tilelink2._
 import uncore.util._
diff --git a/src/main/scala/rocket/SimpleHellaCacheIF.scala b/src/main/scala/rocket/SimpleHellaCacheIF.scala
index 73f3518f..0d8b484c 100644
--- a/src/main/scala/rocket/SimpleHellaCacheIF.scala
+++ b/src/main/scala/rocket/SimpleHellaCacheIF.scala
@@ -4,7 +4,7 @@ package rocket
 
 import Chisel._
 import Chisel.ImplicitConversions._
-import cde.Parameters
+import config._
 import util._
 
 /**
diff --git a/src/main/scala/rocket/dcache.scala b/src/main/scala/rocket/dcache.scala
index cd11c7f0..669fba1f 100644
--- a/src/main/scala/rocket/dcache.scala
+++ b/src/main/scala/rocket/dcache.scala
@@ -4,7 +4,6 @@ package rocket
 
 import Chisel._
 import Chisel.ImplicitConversions._
-import cde.Parameters
 import diplomacy._
 import uncore.agents._
 import uncore.constants._
diff --git a/src/main/scala/rocket/nbdcache.scala b/src/main/scala/rocket/nbdcache.scala
index 7495119f..98492301 100644
--- a/src/main/scala/rocket/nbdcache.scala
+++ b/src/main/scala/rocket/nbdcache.scala
@@ -4,7 +4,6 @@ package rocket
 
 import Chisel._
 import Chisel.ImplicitConversions._
-import cde.Parameters
 import diplomacy._
 import uncore.agents._
 import uncore.constants._