riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

Move to a newer Scala version

Browse Source 
Chisel3 needs a newer version of Scala to run correctly.
This commit is contained in:
Palmer Dabbelt 2016-03-05 18:42:45 -08:00 committed by Palmer Dabbelt
parent 6da45e7f26
commit 476db6ef39
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -10,9 +10,6 @@
[submodule "rocket"] [submodule "rocket"]
path = rocket path = rocket
url = https://github.com/ucb-bar/rocket.git url = https://github.com/ucb-bar/rocket.git
[submodule "chisel"]
path = chisel
url = https://github.com/ucb-bar/chisel.git
[submodule "hardfloat"] [submodule "hardfloat"]
path = hardfloat path = hardfloat
url = https://github.com/ucb-bar/berkeley-hardfloat.git url = https://github.com/ucb-bar/berkeley-hardfloat.git

1
chisel

@ -1 +0,0 @@
Subproject commit 95c889ee0cb9ff177e1bbfa8dc4ed09efb5364c1

2
project/build.scala
View File

@ -8,7 +8,7 @@ object BuildSettings extends Build {
override lazy val settings = super.settings ++ Seq( override lazy val settings = super.settings ++ Seq(
organization := "berkeley", organization := "berkeley",
version := "1.2", version := "1.2",
scalaVersion := "2.11.6", scalaVersion := "2.11.7",
parallelExecution in Global := false, parallelExecution in Global := false,
traceLevel := 15, traceLevel := 15,
scalacOptions ++= Seq("-deprecation","-unchecked"), scalacOptions ++= Seq("-deprecation","-unchecked"),