don't use secondary external address map; collapse submap instead

src/main/scala/Configs.scala

@@ -36,12 +36,17 @@ class BaseConfig extends Config (
       entries += AddrMapEntry("prci", MemSize(0x4000000, MemAttr(AddrMapProt.RW)))
       new AddrMap(entries)
     }
+    lazy val externalAddrMap = new AddrMap(
+      site(ExtraDevices).map(_.addrMapEntry) ++
+      site(ExtMMIOPorts),
+      start = BigInt("50000000", 16),
+      collapse = true)
     lazy val globalAddrMap = {
       val memBase = 0x80000000L
       val memSize = 0x10000000L
 
       val intern = AddrMapEntry("int", internalIOAddrMap)
-      val extern = AddrMapEntry("ext", site(ExtAddrMap).toRange)
+      val extern = AddrMapEntry("ext", externalAddrMap)
       val ioMap = if (site(ExportMMIOPort)) AddrMap(intern, extern) else AddrMap(intern)
 
       val addrMap = AddrMap(
@@ -54,7 +59,6 @@ class BaseConfig extends Config (
     }
     def makeConfigString() = {
       val addrMap = globalAddrMap
-      val extAddrMap = site(ExtAddrMap)
       val plicAddr = addrMap("io:int:plic").start
       val prciAddr = addrMap("io:int:prci").start
       val plicInfo = site(PLICKey)
@@ -101,7 +105,7 @@ class BaseConfig extends Config (
       }
       for (device <- site(ExtraDevices)) {
         val deviceName = device.addrMapEntry.name
-        val deviceRegion = extAddrMap(deviceName)
+        val deviceRegion = addrMap("io:ext:" + deviceName)
         res.append(device.makeConfigString(deviceRegion))
       }
       res append  "};\n"
@@ -237,10 +241,6 @@ class BaseConfig extends Config (
       case ExtraDevices => Nil
       case ExtraTopPorts => (p: Parameters) => new Bundle
       case ExtMMIOPorts => Nil
-      case ExtAddrMap => new AddrMap(
-        site(ExtraDevices).map(_.addrMapEntry) ++
-        site(ExtMMIOPorts),
-        start = BigInt("50000000", 16))
       case NExtMMIOAXIChannels => 0
       case NExtMMIOAHBChannels => 0
       case NExtMMIOTLChannels  => 0

src/main/scala/RocketChip.scala

@@ -40,7 +40,6 @@ case object AsyncMMIOChannels extends Field[Boolean]
 
 /** External address map settings */
 case object ExtMMIOPorts extends Field[Seq[AddrMapEntry]]
-case object ExtAddrMap extends Field[AddrMap]
 
 /** Utility trait for quick access to some relevant parameters */
 trait HasTopLevelParameters {
@@ -225,7 +224,7 @@ class Periphery(implicit val p: Parameters) extends Module
   }
 
   def buildMMIONetwork(implicit p: Parameters) = {
-    val extAddrMap = p(ExtAddrMap)
+    val extAddrMap = p(GlobalAddrMap).subMap("io:ext")
 
     val mmioNetwork = Module(new TileLinkRecursiveInterconnect(1, extAddrMap))
     mmioNetwork.io.in.head <> io.mmio_in.get

src/main/scala/TestConfigs.scala

@@ -69,10 +69,8 @@ class WithComparator extends Config(
     case BuildGroundTest =>
       (p: Parameters) => Module(new ComparatorCore()(p))
     case ComparatorKey => ComparatorParameters(
-      targets    = Seq(
-        site(GlobalAddrMap)("mem"),
-        site(ExtAddrMap)("testram"))
-          .map(entry => entry.start.longValue),
+      targets    = Seq("mem", "io:ext:testram").map(name =>
+                    site(GlobalAddrMap)(name).start.longValue),
       width      = 8,
       operations = 1000,
       atomics    = site(UseAtomics),