From b921bae1070a0ba0054aefa73b3996ac104f286f Mon Sep 17 00:00:00 2001
From: "Wesley W. Terpstra" <wesley@sifive.com>
Date: Tue, 24 May 2016 14:14:57 -0700
Subject: [PATCH] ahb: eliminate trait abused for constants

---
 junctions/src/main/scala/hasti.scala   | 4 +++-
 junctions/src/main/scala/package.scala | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/junctions/src/main/scala/hasti.scala b/junctions/src/main/scala/hasti.scala
index e2d47ed1..53637419 100644
--- a/junctions/src/main/scala/hasti.scala
+++ b/junctions/src/main/scala/hasti.scala
@@ -3,7 +3,7 @@ package junctions
 import Chisel._
 import cde.{Parameters, Field}
 
-trait HastiConstants
+object HastiConstants
 {
   // Values for htrans
   val SZ_HTRANS     = 2
@@ -42,6 +42,8 @@ trait HastiConstants
   def dgate(valid: Bool, b: UInt) = Fill(b.getWidth, valid) & b
 }
 
+import HastiConstants._
+
 case class HastiParameters(dataBits: Int, addrBits: Int)
 case object HastiId extends Field[String]
 case class HastiKey(id: String) extends Field[HastiParameters]
diff --git a/junctions/src/main/scala/package.scala b/junctions/src/main/scala/package.scala
index 317b7109..214a91e5 100644
--- a/junctions/src/main/scala/package.scala
+++ b/junctions/src/main/scala/package.scala
@@ -1 +1 @@
-package object junctions extends HastiConstants
+package object junctions