Cope with changes to AddrMap

rocket/src/main/scala/csr.scala

@@ -8,7 +8,7 @@ import Instructions._
 import cde.{Parameters, Field}
 import uncore._
 import scala.math._
-import junctions.AddrHashMap
+import junctions.AddrMap
 
 class MStatus extends Bundle {
   val debug = Bool() // not truly part of mstatus, but convenient

rocket/src/main/scala/dma.scala

@@ -3,7 +3,7 @@ package rocket
 import Chisel._
 import uncore._
 import uncore.DmaRequest._
-import junctions.{ParameterizedBundle, AddrHashMap}
+import junctions.{ParameterizedBundle, AddrMap}
 import cde.Parameters
 
 trait HasClientDmaParameters extends HasCoreParameters with HasDmaParameters {