Skip to content

Commit 6d49004

Browse files
authored
Merge branch 'main' into small-build-changes
2 parents 30c0fa1 + 30c6bd2 commit 6d49004

File tree

4 files changed

+1
-5
lines changed

4 files changed

+1
-5
lines changed

docs/Software/Spike.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Spike-as-a-Tile can be configured with custom IPC, commit logging, and other beh
4343

4444
.. code-block:: shell
4545
46-
make CONFIG=SpikeUltraFastConfig run-binary BINARY=hello.riscv EXTRA_SPIKE_FLAGS="+spike-ipc=10000 +spike-fast-clint +spike-debug" LOADMEM=1
46+
make CONFIG=SpikeUltraFastConfig run-binary BINARY=hello.riscv EXTRA_SIM_FLAGS="+spike-ipc=10000 +spike-fast-clint +spike-debug" LOADMEM=1
4747
4848
4949
* ``+spike-ipc=``: Sets the maximum number of instructions Spike can retire in a single "tick", or cycle of the uncore simulation.

generators/chipyard/src/main/scala/config/MMIOAcceleratorConfigs.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import org.chipsalliance.cde.config.{Config}
88

99
// DOC include start: FFTRocketConfig
1010
class FFTRocketConfig extends Config(
11-
new chipyard.harness.WithDontTouchChipTopPorts(false) ++ // TODO: hack around dontTouch not working in SFC
1211
new fftgenerator.WithFFTGenerator(numPoints=8, width=16, decPt=8) ++ // add 8-point mmio fft at the default addr (0x2400) with 16bit fixed-point numbers.
1312
new freechips.rocketchip.rocket.WithNHugeCores(1) ++
1413
new chipyard.config.AbstractConfig)
@@ -64,7 +63,6 @@ class LargeNVDLARocketConfig extends Config(
6463

6564
class ManyMMIOAcceleratorRocketConfig extends Config(
6665
new chipyard.example.WithInitZero(0x88000000L, 0x1000L) ++ // add InitZero
67-
new chipyard.harness.WithDontTouchChipTopPorts(false) ++ // TODO: hack around dontTouch not working in SFC
6866
new fftgenerator.WithFFTGenerator(numPoints=8, width=16, decPt=8) ++ // add 8-point mmio fft at the default addr (0x2400) with 16bit fixed-point numbers.
6967
new chipyard.example.WithStreamingPassthrough ++ // use top with tilelink-controlled streaming passthrough
7068
new chipyard.example.WithStreamingFIR ++ // use top with tilelink-controlled streaming FIR

generators/chipyard/src/main/scala/config/RocketConfigs.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class DualRocketConfig extends Config(
1717
new chipyard.config.AbstractConfig)
1818

1919
class TinyRocketConfig extends Config(
20-
new chipyard.harness.WithDontTouchChipTopPorts(false) ++ // TODO FIX: Don't dontTouch the ports
2120
new testchipip.soc.WithNoScratchpads ++ // All memory is the Rocket TCMs
2221
new freechips.rocketchip.subsystem.WithIncoherentBusTopology ++ // use incoherent bus topology
2322
new freechips.rocketchip.subsystem.WithNBanks(0) ++ // remove L2$

generators/chipyard/src/main/scala/config/TutorialConfigs.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ class TutorialMMIOConfig extends Config(
5353

5454
// Tutorial Phase 5: Map a multicore heterogeneous SoC with multiple cores and memory-mapped accelerators
5555
class TutorialNoCConfig extends Config(
56-
new chipyard.harness.WithDontTouchChipTopPorts(false) ++
5756
// Try changing the dimensions of the Mesh topology
5857
new constellation.soc.WithGlobalNoC(constellation.soc.GlobalNoCParams(
5958
NoCParams(

0 commit comments

Comments
 (0)