From 2c17f828b661d8adf59efe45c498b622c2958358 Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Mon, 6 Jun 2016 21:24:55 -0700 Subject: [PATCH] bump chisel and rocket --- chisel3 | 2 +- project/build.scala | 5 +---- rocket | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/chisel3 b/chisel3 index 0b6f6b67..dc2175b0 160000 --- a/chisel3 +++ b/chisel3 @@ -1 +1 @@ -Subproject commit 0b6f6b67f9b511468936ca30218343283071a69d +Subproject commit dc2175b0ebafbbb4b67bcb1e9b92b639b02b36bb diff --git a/project/build.scala b/project/build.scala index 7a3d690b..fb785745 100644 --- a/project/build.scala +++ b/project/build.scala @@ -15,10 +15,7 @@ object BuildSettings extends Build { libraryDependencies ++= Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value) ) - lazy val chiselMacros = project in file("chisel3/chiselMacros") - lazy val chiselFrontend = project in file("chisel3/chiselFrontend") - lazy val chisel = project in file("chisel" + sys.env.getOrElse("CHISEL_VERSION", 2)) dependsOn(chiselMacros, chiselFrontend) - + lazy val chisel = project in file("chisel" + sys.env.getOrElse("CHISEL_VERSION", 2)) lazy val cde = project in file("context-dependent-environments") lazy val hardfloat = project.dependsOn(chisel) lazy val junctions = project.dependsOn(chisel, cde) diff --git a/rocket b/rocket index b42ff423..40e8179b 160000 --- a/rocket +++ b/rocket @@ -1 +1 @@ -Subproject commit b42ff4233d0d3800c7e5c87de62ed97f0c074336 +Subproject commit 40e8179ba5ceac3bbce8ec11429a101ceaed61ae