wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bump rocket-chip

Browse Source 
- Update Scala version to 2.12.4; work around SBT multi-project idiosyncrasies
- Remove HasSystemErrorSlave
This commit is contained in:
Albert Ou
2018-09-29 13:30:07 -07:00
parent a3684d01dd
commit 220aeea4c8
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefrag
View File

@@ -1,13 +1,13 @@
ROCKETCHIP_DIR=$(base_dir)/rocket-chip ROCKETCHIP_DIR=$(base_dir)/rocket-chip
SBT ?= java -Xmx2G -Xss8M -XX:MaxPermSize=256M -jar $(ROCKETCHIP_DIR)/sbt-launch.jar SBT ?= java -Xmx2G -Xss8M -XX:MaxPermSize=256M -jar $(ROCKETCHIP_DIR)/sbt-launch.jar ++2.12.4
lookup_scala_srcs = $(shell find $(1)/ -iname "*.scala" 2> /dev/null) lookup_scala_srcs = $(shell find $(1)/ -iname "*.scala" 2> /dev/null)
PACKAGES=rocket-chip testchipip PACKAGES=rocket-chip testchipip
SCALA_SOURCES=$(foreach pkg,$(PACKAGES),$(call lookup_scala_srcs,$(base_dir)/$(pkg)/src/main/scala)) $(call lookup_scala_srcs,$(base_dir)/src/main/scala) SCALA_SOURCES=$(foreach pkg,$(PACKAGES),$(call lookup_scala_srcs,$(base_dir)/$(pkg)/src/main/scala)) $(call lookup_scala_srcs,$(base_dir)/src/main/scala)
ROCKET_CLASSES ?= "$(ROCKETCHIP_DIR)/target/scala-2.11/classes:$(ROCKETCHIP_DIR)/chisel3/target/scala-2.11/*" ROCKET_CLASSES ?= "$(ROCKETCHIP_DIR)/target/scala-2.12/classes:$(ROCKETCHIP_DIR)/chisel3/target/scala-2.12/*"
FIRRTL_JAR ?= $(ROCKETCHIP_DIR)/lib/firrtl.jar FIRRTL_JAR ?= $(ROCKETCHIP_DIR)/lib/firrtl.jar
FIRRTL ?= java -Xmx2G -Xss8M -XX:MaxPermSize=256M -cp $(ROCKET_CLASSES):$(FIRRTL_JAR) firrtl.Driver FIRRTL ?= java -Xmx2G -Xss8M -XX:MaxPermSize=256M -cp $(ROCKET_CLASSES):$(FIRRTL_JAR) firrtl.Driver

4
build.sbt
View File

@@ -1,9 +1,9 @@
lazy val commonSettings = Seq( lazy val commonSettings = Seq(
organization := "edu.berkeley.cs", organization := "edu.berkeley.cs",
version := "1.0", version := "1.0",
scalaVersion := "2.11.12", scalaVersion := "2.12.4",
traceLevel := 15, traceLevel := 15,
scalacOptions ++= Seq("-deprecation","-unchecked"), scalacOptions ++= Seq("-deprecation","-unchecked","-Xsource:2.11"),
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test", libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test",
libraryDependencies += "org.json4s" %% "json4s-native" % "3.5.3", libraryDependencies += "org.json4s" %% "json4s-native" % "3.5.3",
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value, libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,

2
rocket-chip

Submodule rocket-chip updated: 95f07a8a8e...50bb13d788

2
src/main/scala/example/Top.scala
View File

@@ -10,7 +10,7 @@ import testchipip._
class ExampleTop(implicit p: Parameters) extends RocketSubsystem class ExampleTop(implicit p: Parameters) extends RocketSubsystem
with CanHaveMasterAXI4MemPort with CanHaveMasterAXI4MemPort
with HasPeripheryBootROM with HasPeripheryBootROM
with HasSystemErrorSlave // with HasSystemErrorSlave
with HasSyncExtInterrupts with HasSyncExtInterrupts
with HasNoDebug with HasNoDebug
with HasPeripherySerial { with HasPeripherySerial {

2
testchipip

Submodule testchipip updated: 8bf7e85ceb...5aebd3a48d