riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

[rocketchip] avoid pending merge conflict]

Browse Source
This commit is contained in:
Henry Cook 2016-09-19 13:24:01 -07:00
parent ddcf1b4099
commit df442ed82c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/rocketchip/BaseTop.scala
View File

@ -61,8 +61,6 @@ class BaseTopModule[+L <: BaseTop, +B <: BaseTopBundle](val p: Parameters, l: L,
val coreplex = p(BuildCoreplex)(p, outer.c) val coreplex = p(BuildCoreplex)(p, outer.c)
val io: B = b(coreplex) val io: B = b(coreplex)
io.success := coreplex.io.success
val mmioNetwork = val mmioNetwork =
Module(new TileLinkRecursiveInterconnect(1, p(GlobalAddrMap).subMap("io:ext"))( Module(new TileLinkRecursiveInterconnect(1, p(GlobalAddrMap).subMap("io:ext"))(
p.alterPartial({ case TLId => "L2toMMIO" }))) p.alterPartial({ case TLId => "L2toMMIO" })))
@ -80,4 +78,6 @@ class BaseTopModule[+L <: BaseTop, +B <: BaseTopBundle](val p: Parameters, l: L,
println("Generated Configuration String") println("Generated Configuration String")
println(p(ConfigString)) println(p(ConfigString))
ConfigStringOutput.contents = Some(p(ConfigString)) ConfigStringOutput.contents = Some(p(ConfigString))
io.success := coreplex.io.success
} }