Merge branch 'master' into test_mode_reset

2017-09-15 17:26:11 -07:00
parent 641a8e7eab e8702e2687
commit 9b75dd7e5b
22 changed files with 80 additions and 84 deletions
--- a/src/main/scala/devices/debug/Periphery.scala
+++ b/src/main/scala/devices/debug/Periphery.scala
@ -13,6 +13,7 @@ import freechips.rocketchip.util._

 /** A knob selecting one of the two possible debug interfaces */
 case object IncludeJtagDTM extends Field[Boolean](false)
+
 /** A wrapper bundle containing one of the two possible debug interfaces */

 class DebugIO(implicit val p: Parameters) extends ParameterizedBundle()(p) with CanHavePSDTestModeIO {