move junctions utils into top-level utils package

src/main/scala/uncore/agents/Agents.scala

@@ -4,7 +4,8 @@ package uncore.agents
 
 import Chisel._
 import cde.{Parameters, Field}
-import junctions._
+import junctions.PAddrBits
+import util.ParameterizedBundle
 import uncore.tilelink._
 import uncore.converters._
 import uncore.coherence._
@@ -41,7 +42,7 @@ trait HasCoherenceAgentParameters {
 
 abstract class CoherenceAgentModule(implicit val p: Parameters) extends Module
   with HasCoherenceAgentParameters
-abstract class CoherenceAgentBundle(implicit val p: Parameters) extends junctions.ParameterizedBundle()(p)
+abstract class CoherenceAgentBundle(implicit val p: Parameters) extends ParameterizedBundle()(p)
    with HasCoherenceAgentParameters
 
 trait HasCoherenceAgentWiringHelpers {

src/main/scala/uncore/agents/Cache.scala

@@ -4,7 +4,8 @@ package uncore.agents
 
 import Chisel._
 import scala.reflect.ClassTag
-import junctions._
+import junctions.PAddrBits
+import util.ParameterizedBundle
 import uncore.util.AMOALU
 import uncore.coherence._
 import uncore.tilelink._

src/main/scala/uncore/agents/Trackers.scala

@@ -7,7 +7,7 @@ import uncore.coherence._
 import uncore.tilelink._
 import uncore.util._
 import uncore.util._
-import junctions._
+import util.ParameterizedBundle
 import cde.{Field, Parameters}
 import scala.math.max
 

src/main/scala/uncore/converters/Nasti.scala

@@ -2,6 +2,7 @@ package uncore.converters
 
 import Chisel._
 import junctions._
+import util.{ReorderQueue, DecoupledHelper}
 import uncore.tilelink._
 import uncore.constants._
 import cde.Parameters

src/main/scala/uncore/converters/Tilelink.scala

@@ -1,7 +1,8 @@
 package uncore.converters
 
 import Chisel._
-import junctions._
+import util.{ReorderQueue, DecoupledHelper}
+import junctions.PAddrBits
 import uncore.tilelink._
 import uncore.util._
 import uncore.constants._

src/main/scala/uncore/devices/Debug.scala

@@ -3,9 +3,10 @@
 package uncore.devices
 
 import Chisel._
+import junctions._
 import uncore.tilelink._
 import uncore.util._
-import junctions._
+import util.ParameterizedBundle
 import cde.{Parameters, Config, Field}
 
 // *****************************************

src/main/scala/uncore/tilelink/Definitions.scala

@@ -90,7 +90,7 @@ trait HasTileLinkParameters {
 
 abstract class TLModule(implicit val p: Parameters) extends Module
   with HasTileLinkParameters
-abstract class TLBundle(implicit val p: Parameters) extends junctions.ParameterizedBundle()(p)
+abstract class TLBundle(implicit val p: Parameters) extends util.ParameterizedBundle()(p)
   with HasTileLinkParameters
 
 /** Base trait for all TileLink channels */

src/main/scala/uncore/tilelink/Network.scala

@@ -61,7 +61,7 @@ class BasicCrossbar[T <: Data](conf: CrossbarConfig[T]) extends AbstractCrossbar
 
 abstract class LogicalNetwork extends Module
 
-class LogicalHeader(implicit p: Parameters) extends junctions.ParameterizedBundle()(p) {
+class LogicalHeader(implicit p: Parameters) extends util.ParameterizedBundle()(p) {
   val src = UInt(width = p(LNHeaderBits))
   val dst = UInt(width = p(LNHeaderBits))
 }