From 868e74765697add459e3ee2577c58894aefaf20f Mon Sep 17 00:00:00 2001
From: Christopher Celio <celio@eecs.berkeley.edu>
Date: Thu, 25 Sep 2014 18:52:58 -0700
Subject: [PATCH] Factored out Rocket specifics from CoreParameters

   - Added new RocketCoreParameters
   - Other cores using Rocket as a library will no longer conflict against
      Rocket's requires().
---
 rocket/src/main/scala/core.scala | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/rocket/src/main/scala/core.scala b/rocket/src/main/scala/core.scala
index f02f1424..ecb41f01 100644
--- a/rocket/src/main/scala/core.scala
+++ b/rocket/src/main/scala/core.scala
@@ -28,10 +28,15 @@ abstract trait CoreParameters extends UsesParameters {
   val coreMaxAddrBits = math.max(params(PPNBits),params(VPNBits)+1) + params(PgIdxBits)
 
   if(params(FastLoadByte)) require(params(FastLoadWord))
+}
+
+abstract trait RocketCoreParameters extends CoreParameters
+{
   require(params(RetireWidth) == 1) // for now...
 }
-abstract class CoreBundle extends Bundle with CoreParameters
-abstract class CoreModule extends Module with CoreParameters
+
+abstract class CoreBundle extends Bundle with RocketCoreParameters
+abstract class CoreModule extends Module with RocketCoreParameters
 
 class RocketIO extends Bundle
 {