Skip to content

Commit

Permalink
Update SpinalHDL & VexRiscv
Browse files Browse the repository at this point in the history
  • Loading branch information
rpls committed Mar 8, 2024
1 parent da278f4 commit ef9e4ef
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
ThisBuild / organization := "mupq"

// SpinalHDL v1.8.0 can support newer Scala versions, but VexRiscv only references 2.11.12
// SpinalHDL can support newer Scala versions, but VexRiscv only references 2.11.12
ThisBuild / scalaVersion := "2.11.12"

val spinalVersion = "1.8.0"
val spinalVersion = "1.10.1"

lazy val pqvexriscv = (project in file("."))
.settings(
name := "pqvexriscv",
version := "0.1",
libraryDependencies ++= Seq(
"net.java.dev.jna" % "jna" % "5.13.0",
"org.scalatest" %% "scalatest" % "3.2.5" % "test",
"net.java.dev.jna" % "jna" % "5.14.0",
"org.scalatest" %% "scalatest" % "3.2.5" % "test", // Same version as VexRiscv uses...
compilerPlugin("com.github.spinalhdl" % "spinalhdl-idsl-plugin_2.11" % spinalVersion)
),
run / connectInput := true,
outputStrategy := Some(StdoutOutput),
).dependsOn(vexRiscv)

// Newer versions of VexRiscv bring a new debugger, that requires more refactoring
lazy val vexRiscv = RootProject(uri("https://github.com/SpinalHDL/VexRiscv.git#b29eb542f278edb8ee2c91863a5b26e76b5932c9"))
lazy val vexRiscv = RootProject(uri("https://github.com/SpinalHDL/VexRiscv.git#e52251d88c1d0dd397cc976654b291909152a979"))

fork := true

2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.4
sbt.version=1.9.9

0 comments on commit ef9e4ef

Please sign in to comment.