1
0

[rocket] resolve cde/config conflicts

This commit is contained in:
Henry Cook 2016-11-18 19:11:34 -08:00
parent 8b908465e0
commit 2976fd84e4
5 changed files with 3 additions and 5 deletions

View File

@ -3,7 +3,7 @@
package rocket package rocket
import Chisel._ import Chisel._
import cde.{Parameters, Field} import config.{Parameters, Field}
import diplomacy._ import diplomacy._
import uncore.tilelink2._ import uncore.tilelink2._
import uncore.agents._ import uncore.agents._

View File

@ -4,9 +4,9 @@ package rocket
import Chisel._ import Chisel._
import Chisel.ImplicitConversions._ import Chisel.ImplicitConversions._
import cde.Parameters
import junctions._ import junctions._
import diplomacy._ import diplomacy._
import config._
import uncore.constants._ import uncore.constants._
import uncore.tilelink2._ import uncore.tilelink2._
import uncore.util._ import uncore.util._

View File

@ -4,7 +4,7 @@ package rocket
import Chisel._ import Chisel._
import Chisel.ImplicitConversions._ import Chisel.ImplicitConversions._
import cde.Parameters import config._
import util._ import util._
/** /**

View File

@ -4,7 +4,6 @@ package rocket
import Chisel._ import Chisel._
import Chisel.ImplicitConversions._ import Chisel.ImplicitConversions._
import cde.Parameters
import diplomacy._ import diplomacy._
import uncore.agents._ import uncore.agents._
import uncore.constants._ import uncore.constants._

View File

@ -4,7 +4,6 @@ package rocket
import Chisel._ import Chisel._
import Chisel.ImplicitConversions._ import Chisel.ImplicitConversions._
import cde.Parameters
import diplomacy._ import diplomacy._
import uncore.agents._ import uncore.agents._
import uncore.constants._ import uncore.constants._