wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1430 from ucb-bar/chisel356fixes

Browse Source 
Resolve merge conflicts in chisel3.5.6 bump
This commit is contained in:
Jerry Zhao
2023-04-08 15:23:51 -07:00
committed by GitHub
parent af6a88d5f9 0f6f38e66b
commit 60468e161c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
generators/chipyard/src/main/scala/ConfigFinder.scala
View File

@@ -5,7 +5,7 @@ import org.reflections.scanners.Scanners.SubTypes
import scala.jdk.CollectionConverters._ import scala.jdk.CollectionConverters._
import scala.collection.{SortedSet} import scala.collection.{SortedSet}
import freechips.rocketchip.config.{Config} import org.chipsalliance.cde.config.{Config}
object ConfigFinder { object ConfigFinder {
def main(args: Array[String]) = { def main(args: Array[String]) = {

2
generators/chipyard/src/main/scala/example/CustomChipTop.scala
View File

@@ -3,7 +3,7 @@ package chipyard.example
import chisel3._ import chisel3._
import chipyard.iobinders._ import chipyard.iobinders._
import freechips.rocketchip.config._ import org.chipsalliance.cde.config._
import freechips.rocketchip.diplomacy.{InModuleBody} import freechips.rocketchip.diplomacy.{InModuleBody}
import barstools.iocell.chisel._ import barstools.iocell.chisel._
import chipyard._ import chipyard._