Hardware
/
VexRiscv
mirror of https://github.com/SpinalHDL/VexRiscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

This commit is contained in:
Dolu1990 2019-01-16 16:32:12 +01:00
parent 927ab6d127 b5caca54cd
commit 8f1b4cc8e5
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@ -162,13 +162,13 @@ You can find two example CPU instances in:
To generate the corresponding RTL as a VexRiscv.v file, run the following commands in the root directory of this repository:
```sh
sbt "run-main vexriscv.demo.GenFull"
sbt "runMain vexriscv.demo.GenFull"
```
or
```sh
sbt "run-main vexriscv.demo.GenSmallest"
sbt "runMain vexriscv.demo.GenSmallest"
```
NOTES:
@ -204,7 +204,7 @@ Then you can use the https://github.com/SpinalHDL/openocd_riscv tool to create a
```sh
#in the VexRiscv repository, to run the simulation on which one OpenOCD can connect itself =>
sbt "run-main vexriscv.demo.GenFull"
sbt "runMain vexriscv.demo.GenFull"
cd src/test/cpp/regression
make run DEBUG_PLUGIN_EXTERNAL=yes
@ -254,7 +254,7 @@ the [Pinsec SOC](https://spinalhdl.github.io/SpinalDoc/spinal/lib/pinsec/hardwar
To generate the Briey SoC Hardware:
```sh
sbt "run-main vexriscv.demo.Briey"
sbt "runMain vexriscv.demo.Briey"
```
To run the verilator simulation of the Briey SoC which can then be connected to OpenOCD/GDB, first get those dependencies:
@ -309,10 +309,10 @@ To generate the Murax SoC Hardware :
```sh
# To generate the SoC without any content in the ram
sbt "run-main vexriscv.demo.Murax"
sbt "runMain vexriscv.demo.Murax"
# To generate the SoC with a demo program already in ram
sbt "run-main vexriscv.demo.MuraxWithRamInit"
sbt "runMain vexriscv.demo.MuraxWithRamInit"
```
The demo program included by default with `MuraxWithRamInit` will blink the
@ -560,7 +560,7 @@ and is self-tested by the `src/test/cpp/custom/simd_add` application by running
```sh
# Generate the CPU
sbt "run-main vexriscv.demo.GenCustomSimdAdd"
sbt "runMain vexriscv.demo.GenCustomSimdAdd"
cd src/test/cpp/regression/

4
build.sbt
View File

@ -29,8 +29,8 @@ lazy val root = (project in file(".")).
version := "1.0.0"
)),
libraryDependencies ++= Seq(
"com.github.spinalhdl" % "spinalhdl-core_2.11" % "1.3.0",
"com.github.spinalhdl" % "spinalhdl-lib_2.11" % "1.3.0",
"com.github.spinalhdl" % "spinalhdl-core_2.11" % "1.3.1",
"com.github.spinalhdl" % "spinalhdl-lib_2.11" % "1.3.1",
"org.scalatest" % "scalatest_2.11" % "2.2.1",
"org.yaml" % "snakeyaml" % "1.8"
),

4
scripts/Murax/iCE40-hx8k_breakout_board/Makefile
View File

@ -3,10 +3,10 @@
VERILOG = ../../../Murax.v toplevel.v
generate :
(cd ../../..; sbt "run-main vexriscv.demo.MuraxWithRamInit")
(cd ../../..; sbt "runMain vexriscv.demo.MuraxWithRamInit")
../../../Murax.v :
(cd ../../..; sbt "run-main vexriscv.demo.MuraxWithRamInit")
(cd ../../..; sbt "runMain vexriscv.demo.MuraxWithRamInit")
../../../Murax.v*.bin:

4
scripts/Murax/iCE40-hx8k_breakout_board_xip/Makefile
View File

@ -3,10 +3,10 @@
VERILOG = ../../../Murax_iCE40_hx8k_breakout_board_xip.v
generate :
#(cd ../../..; sbt "run-main vexriscv.demo.Murax_iCE40_hx8k_breakout_board_xip")
#(cd ../../..; sbt "runMain vexriscv.demo.Murax_iCE40_hx8k_breakout_board_xip")
../../../Murax_iCE40_hx8k_breakout_board_xip.v :
#(cd ../../..; sbt "run-main vexriscv.demo.Murax_iCE40_hx8k_breakout_board_xip")
#(cd ../../..; sbt "runMain vexriscv.demo.Murax_iCE40_hx8k_breakout_board_xip")
../../../Murax_iCE40_hx8k_breakout_board_xip.v*.bin:

4
scripts/Murax/iCE40HX8K-EVB/Makefile
View File

@ -3,10 +3,10 @@
VERILOG = ../../../Murax.v toplevel.v toplevel_pll.v
generate :
(cd ../../..; sbt "run-main vexriscv.demo.MuraxWithRamInit")
(cd ../../..; sbt "runMain vexriscv.demo.MuraxWithRamInit")
../../../Murax.v :
(cd ../../..; sbt "run-main vexriscv.demo.MuraxWithRamInit")
(cd ../../..; sbt "runMain vexriscv.demo.MuraxWithRamInit")
../../../Murax.v*.bin:

2
src/main/scala/vexriscv/TestsWorkspace.scala
View File

@ -153,7 +153,7 @@ object TestsWorkspace {
// wfiGenAsNop = true,
// ucycleAccess = CsrAccess.NONE
// )),
// new DebugPlugin(ClockDomain.current.clone(reset = Bool().setName("debugReset"))),
new DebugPlugin(ClockDomain.current.clone(reset = Bool().setName("debugReset"))),
new BranchPlugin(
earlyBranch = true,
catchAddressMisaligned = true,