From e0ae03923543b4b2867432c093ace7cf9b1b1d6c Mon Sep 17 00:00:00 2001
From: Howard Mao <zhehao.mao@gmail.com>
Date: Thu, 11 Aug 2016 10:44:32 -0700
Subject: [PATCH] fix config string generation for extra devices

---
 src/main/scala/Configs.scala | 2 +-
 src/main/scala/Devices.scala | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/Configs.scala b/src/main/scala/Configs.scala
index 30289044..c009c691 100644
--- a/src/main/scala/Configs.scala
+++ b/src/main/scala/Configs.scala
@@ -94,12 +94,12 @@ class BasePlatformConfig extends Config (
         res append  "    };\n"
         res append  "  };\n"
       }
+      res append  "};\n"
       for (device <- site(ExtraDevices)) {
         val deviceName = device.addrMapEntry.name
         val deviceRegion = addrMap("io:ext:" + deviceName)
         res.append(device.makeConfigString(deviceRegion))
       }
-      res append  "};\n"
       res append '\u0000'
       res.toString.getBytes
     }
diff --git a/src/main/scala/Devices.scala b/src/main/scala/Devices.scala
index ba3b19b5..65ff4add 100644
--- a/src/main/scala/Devices.scala
+++ b/src/main/scala/Devices.scala
@@ -12,9 +12,9 @@ abstract class Device {
   def builder(port: ClientUncachedTileLinkIO, extra: Bundle, p: Parameters): Unit
   def addrMapEntry: AddrMapEntry
   def makeConfigString(region: MemRegion): String = {
-    s"  ${addrMapEntry.name} {\n" +
-    s"    addr 0x${region.start.toString(16)};\n" +
-    s"    size 0x${region.size.toString(16)}; \n" +
-     "  }\n"
+    s"${addrMapEntry.name} {\n" +
+    s"  addr 0x${region.start.toString(16)};\n" +
+    s"  size 0x${region.size.toString(16)}; \n" +
+     "}\n"
   }
 }