From ccc77a02aab8cb351309eaad840095429a800593 Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Thu, 15 Jun 2023 14:13:11 -0700 Subject: [PATCH 1/2] Revert "[ci skip] Fix broken docs link" This reverts commit 8e39fe1fa1d8ae69e8b6be850220ac0c8472c15b. --- .../src/main/scala/config/fragments/PeripheralFragments.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/generators/chipyard/src/main/scala/config/fragments/PeripheralFragments.scala b/generators/chipyard/src/main/scala/config/fragments/PeripheralFragments.scala index 09636c49e6..290e3dfe09 100644 --- a/generators/chipyard/src/main/scala/config/fragments/PeripheralFragments.scala +++ b/generators/chipyard/src/main/scala/config/fragments/PeripheralFragments.scala @@ -39,7 +39,6 @@ class WithBootROM(address: BigInt = 0x10000, size: Int = 0x10000, hang: BigInt = )) }) -// DOC include start: gpio config fragment /** * Config fragment for adding a GPIO peripheral device to the SoC * @@ -50,7 +49,6 @@ class WithGPIO(address: BigInt = 0x10010000, width: Int = 4) extends Config ((si case PeripheryGPIOKey => up(PeripheryGPIOKey) ++ Seq( GPIOParams(address = address, width = width, includeIOF = false)) }) -// DOC include end: gpio config fragment /** * Config fragment for removing all UART peripheral devices from the SoC From cb24cf895585f168ef9b3b4cde793130014f2c84 Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Thu, 15 Jun 2023 14:13:56 -0700 Subject: [PATCH 2/2] Revert "Merge pull request #1511 from ucb-bar/improve-peripheral" This reverts commit 4d8b3f9dbf9d8212a4509bb4b360d9b6075c23f6, reversing changes made to d287fed654d1d5f62d1ddae97b6c56956edf7dad. --- .gitignore | 1 - .../fragments/PeripheralFragments.scala | 109 +++--------------- 2 files changed, 19 insertions(+), 91 deletions(-) diff --git a/.gitignore b/.gitignore index 5dd75bec68..ac8e84d09b 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,3 @@ project/project/ .ivy2 .sbt .classpath_cache/ -.vscode/ diff --git a/generators/chipyard/src/main/scala/config/fragments/PeripheralFragments.scala b/generators/chipyard/src/main/scala/config/fragments/PeripheralFragments.scala index 290e3dfe09..3b607ae05b 100644 --- a/generators/chipyard/src/main/scala/config/fragments/PeripheralFragments.scala +++ b/generators/chipyard/src/main/scala/config/fragments/PeripheralFragments.scala @@ -6,8 +6,7 @@ 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} @@ -15,119 +14,49 @@ 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")) }) -/** - * 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)) +// DOC include start: gpio config fragment +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) => {