Merge pull request #1518 from ucb-bar/revert-periph

Revert changes to peripheral fragments

.gitignore

@@ -27,4 +27,3 @@ project/project/
 .ivy2
 .sbt
 .classpath_cache/
-.vscode/

generators/chipyard/src/main/scala/config/fragments/PeripheralFragments.scala

@@ -6,130 +6,57 @@ import chisel3.util.{log2Up}
 
 import org.chipsalliance.cde.config.{Config}
 import freechips.rocketchip.devices.tilelink.{BootROMLocated, PLICKey}
-import freechips.rocketchip.devices.debug.{Debug, ExportDebug, DebugModuleKey, DMI, JtagDTMKey, JtagDTMConfig}
-import freechips.rocketchip.diplomacy.{AsynchronousCrossing}
+import freechips.rocketchip.devices.debug.{Debug, ExportDebug, DebugModuleKey, DMI}
 import freechips.rocketchip.stage.phases.TargetDirKey
 import freechips.rocketchip.subsystem._
 import freechips.rocketchip.tile.{XLen}
 
 import sifive.blocks.devices.gpio._
 import sifive.blocks.devices.uart._
 import sifive.blocks.devices.spi._
-import sifive.blocks.devices.i2c._
 
 import testchipip._
 
 import chipyard.{ExtTLMem}
 
-/**
-  * Config fragment for adding a BootROM to the SoC
-  * 
-  * @param address the address of the BootROM device
-  * @param size the size of the BootROM
-  * @param hang the power-on reset vector, i.e. the program counter will be set to this value on reset
-  * @param contentFileName the path to the BootROM image
-  */
-class WithBootROM(address: BigInt = 0x10000, size: Int = 0x10000, hang: BigInt = 0x10040) extends Config((site, here, up) => {
+// Set the bootrom to the Chipyard bootrom
+class WithBootROM extends Config((site, here, up) => {
   case BootROMLocated(x) => up(BootROMLocated(x), site)
-      .map(_.copy(
-        address = address,
-        size = size,
-        hang = hang,
-        contentFileName = s"${site(TargetDirKey)}/bootrom.rv${site(XLen)}.img"
-      ))
+      .map(_.copy(contentFileName = s"${site(TargetDirKey)}/bootrom.rv${site(XLen)}.img"))
 })
 
 // DOC include start: gpio config fragment
-/**
- * Config fragment for adding a GPIO peripheral device to the SoC
- * 
- * @param address the address of the GPIO device
- * @param width the number of pins of the GPIO device
- */
-class WithGPIO(address: BigInt = 0x10010000, width: Int = 4) extends Config ((site, here, up) => {
-  case PeripheryGPIOKey => up(PeripheryGPIOKey) ++ Seq(
-    GPIOParams(address = address, width = width, includeIOF = false))
+class WithGPIO extends Config((site, here, up) => {
+  case PeripheryGPIOKey => Seq(
+    GPIOParams(address = 0x10012000, width = 4, includeIOF = false))
 })
 // DOC include end: gpio config fragment
 
-/**
- * Config fragment for removing all UART peripheral devices from the SoC
- */
-class WithNoUART extends Config((site, here, up) => {
-  case PeripheryUARTKey => Nil
+class WithUART(baudrate: BigInt = 115200) extends Config((site, here, up) => {
+  case PeripheryUARTKey => Seq(
+    UARTParams(address = 0x54000000L, nTxEntries = 256, nRxEntries = 256, initBaudRate = baudrate))
 })
 
-/**
-  * Config fragment for adding a UART peripheral device to the SoC
-  *
-  * @param address the address of the UART device
-  * @param baudrate the baudrate of the UART device
-  */
-class WithUART(address: BigInt = 0x10020000, baudrate: BigInt = 115200) extends Config ((site, here, up) => {
-  case PeripheryUARTKey => up(PeripheryUARTKey) ++ Seq(
-    UARTParams(address = address, nTxEntries = 256, nRxEntries = 256, initBaudRate = baudrate))
+class WithNoUART extends Config((site, here, up) => {
+  case PeripheryUARTKey => Nil
 })
 
 class WithUARTFIFOEntries(txEntries: Int, rxEntries: Int) extends Config((site, here, up) => {
   case PeripheryUARTKey => up(PeripheryUARTKey).map(_.copy(nTxEntries = txEntries, nRxEntries = rxEntries))
 })
 
-/**
-  * Config fragment for adding a SPI peripheral device with Execute-in-Place capability to the SoC
-  *
-  * @param address the address of the SPI controller
-  * @param fAddress the address of the Execute-in-Place (XIP) region of the SPI flash memory
-  * @param size the size of the Execute-in-Place (XIP) region of the SPI flash memory
-  */
-class WithSPIFlash(address: BigInt = 0x10030000, fAddress: BigInt = 0x20000000, size: BigInt = 0x10000000) extends Config((site, here, up) => {
+class WithSPIFlash(size: BigInt = 0x10000000) extends Config((site, here, up) => {
   // Note: the default size matches freedom with the addresses below
-  case PeripherySPIFlashKey => up(PeripherySPIFlashKey) ++ Seq(
-    SPIFlashParams(rAddress = address, fAddress = fAddress, fSize = size))
-})
-
-/**
-  * Config fragment for adding a SPI peripheral device to the SoC
-  *
-  * @param address the address of the SPI controller
-  */
-class WithSPI(address: BigInt = 0x10031000) extends Config((site, here, up) => {
-  case PeripherySPIKey => up(PeripherySPIKey) ++ Seq(
-    SPIParams(rAddress = address))
-})
-
-/**
-  * Config fragment for adding a I2C peripheral device to the SoC
-  *
-  * @param address the address of the I2C controller
-  */
-class WithI2C(address: BigInt = 0x10040000) extends Config((site, here, up) => {
-  case PeripheryI2CKey => up(PeripheryI2CKey) ++ Seq(
-    I2CParams(address = address, controlXType = AsynchronousCrossing(), intXType = AsynchronousCrossing())
-  )
-})
-
-class WithNoDebug extends Config((site, here, up) => {
-  case DebugModuleKey => None
+  case PeripherySPIFlashKey => Seq(
+    SPIFlashParams(rAddress = 0x10040000, fAddress = 0x20000000, fSize = size))
 })
 
 class WithDMIDTM extends Config((site, here, up) => {
   case ExportDebug => up(ExportDebug, site).copy(protocols = Set(DMI))
 })
 
-/**
-  * Config fragment for adding a JTAG Debug Module to the SoC
-  *
-  * @param idcodeVersion the version of the JTAG protocol the Debug Module supports
-  * @param partNum the part number of the Debug Module
-  * @param manufId the 11-bit JEDEC Designer ID of the chip manufacturer
-  * @param debugIdleCycles the number of cycles the Debug Module waits before responding to a request
-  */
-class WithJTAGDTMKey(idcodeVersion: Int = 2, partNum: Int = 0x000, manufId: Int = 0x489, debugIdleCycles: Int = 5) extends Config((site, here, up) => {
-  case JtagDTMKey => new JtagDTMConfig (
-    idcodeVersion = idcodeVersion,
-    idcodePartNum = partNum,
-    idcodeManufId = manufId,
-    debugIdleCycles = debugIdleCycles)
+class WithNoDebug extends Config((site, here, up) => {
+  case DebugModuleKey => None
 })
 
 class WithTLBackingMemory extends Config((site, here, up) => {