From c558393280802dd5eb245dba9b74aa14cd0a0433 Mon Sep 17 00:00:00 2001
From: Jerry Zhao <jerryz123@berkeley.edu>
Date: Sat, 29 Jun 2024 19:41:12 -0700
Subject: [PATCH] Move RocketConfigs to rocket.Configs

---
 .../{subsystem/RocketConfigs.scala => rocket/Configs.scala}  | 5 ++---
 src/main/scala/system/Configs.scala                          | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename src/main/scala/{subsystem/RocketConfigs.scala => rocket/Configs.scala} (96%)

diff --git a/src/main/scala/subsystem/RocketConfigs.scala b/src/main/scala/rocket/Configs.scala
similarity index 96%
rename from src/main/scala/subsystem/RocketConfigs.scala
rename to src/main/scala/rocket/Configs.scala
index 085ffa57e1b..4d6d204c8e8 100644
--- a/src/main/scala/subsystem/RocketConfigs.scala
+++ b/src/main/scala/rocket/Configs.scala
@@ -1,5 +1,4 @@
-package freechips.rocketchip.subsystem
-// TODO move to freechips.rocketchip.rocket
+package freechips.rocketchip.rocket
 
 import chisel3.util._
 
@@ -7,7 +6,7 @@ import org.chipsalliance.cde.config._
 import org.chipsalliance.diplomacy.lazymodule._
 
 import freechips.rocketchip.prci.{SynchronousCrossing, AsynchronousCrossing, RationalCrossing, ClockCrossingType}
-import freechips.rocketchip.rocket.{RocketCoreParams, MulDivParams, DCacheParams, ICacheParams, BTBParams, DebugROBParams}
+import freechips.rocketchip.subsystem.{TilesLocated, NumTiles, HierarchicalLocation, RocketCrossingParams, SystemBusKey, CacheBlockBytes, RocketTileAttachParams, InSubsystem, InCluster, HierarchicalElementMasterPortParams, HierarchicalElementSlavePortParams, CBUS, CCBUS, ClustersLocated, TileAttachConfig, CloneTileAttachParams}
 import freechips.rocketchip.tile.{RocketTileParams}
 import scala.reflect.ClassTag
 
diff --git a/src/main/scala/system/Configs.scala b/src/main/scala/system/Configs.scala
index 9827cf428c0..a78712c91ad 100644
--- a/src/main/scala/system/Configs.scala
+++ b/src/main/scala/system/Configs.scala
@@ -5,6 +5,7 @@ package freechips.rocketchip.system
 
 import org.chipsalliance.cde.config.Config
 import freechips.rocketchip.subsystem._
+import freechips.rocketchip.rocket.{WithNBigCores, WithNMedCores, WithNSmallCores, WithRV32, WithFP16, WithHypervisor, With1TinyCore, WithScratchpadsOnly, WithCloneRocketTiles}
 
 class WithJtagDTMSystem extends freechips.rocketchip.subsystem.WithJtagDTM
 class WithDebugSBASystem extends freechips.rocketchip.subsystem.WithDebugSBA