Merge pull request #1430 from ucb-bar/chisel356fixes

Resolve merge conflicts in chisel3.5.6 bump
ucb-bar · Apr 8, 2023 · 60468e1 · 60468e1
2 parents af6a88d + 0f6f38e
commit 60468e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/generators/chipyard/src/main/scala/ConfigFinder.scala b/generators/chipyard/src/main/scala/ConfigFinder.scala
@@ -5,7 +5,7 @@ import org.reflections.scanners.Scanners.SubTypes
 import scala.jdk.CollectionConverters._
 import scala.collection.{SortedSet}
 
-import freechips.rocketchip.config.{Config}
+import org.chipsalliance.cde.config.{Config}
 
 object ConfigFinder {
     def main(args: Array[String]) = {

diff --git a/generators/chipyard/src/main/scala/example/CustomChipTop.scala b/generators/chipyard/src/main/scala/example/CustomChipTop.scala
@@ -3,7 +3,7 @@ package chipyard.example
 import chisel3._
 import chipyard.iobinders._
 
-import freechips.rocketchip.config._
+import org.chipsalliance.cde.config._
 import freechips.rocketchip.diplomacy.{InModuleBody}
 import barstools.iocell.chisel._
 import chipyard._