From e8e95d4bcf025f266070819c266c7d7ddae8676f Mon Sep 17 00:00:00 2001 From: "Wesley W. Terpstra" Date: Tue, 22 Nov 2016 01:53:35 -0800 Subject: [PATCH] regression: remove cde submodule update --- Makefrag | 2 +- README.md | 6 ------ project/build.scala | 3 +-- regression/Makefile | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Makefrag b/Makefrag index 70bc0c21..b613ae51 100644 --- a/Makefrag +++ b/Makefrag @@ -27,7 +27,7 @@ $(FIRRTL_JAR): $(shell find $(base_dir)/firrtl/src/main/scala -iname "*.scala") cp -p $(FIRRTL_JAR) $(base_dir)/chisel3/lib src_path := src/main/scala -default_submodules := . hardfloat context-dependent-environments chisel3 +default_submodules := . hardfloat chisel3 chisel_srcs := $(foreach submodule,$(default_submodules) $(ROCKETCHIP_ADDONS),$(shell find $(base_dir)/$(submodule)/$(src_path) -name "*.scala")) disasm := 2> diff --git a/README.md b/README.md index 05e7fc1c..544d0753 100644 --- a/README.md +++ b/README.md @@ -139,12 +139,6 @@ has an additional bit) to handle subnormal numbers more efficiently in the processor. Please take a look at the [README](https://github.com/ucb-bar/berkeley-hardfloat/blob/master/README.md) in the repository for more information. -* **context-dependent-environments** -([https://github.com/ucb-bar/context-dependent-environments](https://github.com/ucb-bar/context-dependent-environments)): -The rocket-chip Chisel code is highly parameterizable, and utilizes the classes in -this subrepo to set and pass parameters to different levels of the design. Note that in -Chisel2, this was handled by Chisel itself, but has been moved into a seperate -library for use with Chisel3. * **riscv-tools** ([https://github.com/riscv/riscv-tools](https://github.com/riscv/riscv-tools)): We tag a version of riscv-tools that works with the RTL committed in the diff --git a/project/build.scala b/project/build.scala index 80047920..b364f252 100644 --- a/project/build.scala +++ b/project/build.scala @@ -17,9 +17,8 @@ object BuildSettings extends Build { ) lazy val chisel = project in file("chisel3") - lazy val cde = project in file("context-dependent-environments") lazy val hardfloat = project.dependsOn(chisel) - lazy val rocketchip = (project in file(".")).settings(chipSettings).dependsOn(chisel, cde, hardfloat) + lazy val rocketchip = (project in file(".")).settings(chipSettings).dependsOn(chisel, hardfloat) lazy val addons = settingKey[Seq[String]]("list of addons used for this build") lazy val make = inputKey[Unit]("trigger backend-specific makefile command") diff --git a/regression/Makefile b/regression/Makefile index a6322da2..6b56e1e3 100644 --- a/regression/Makefile +++ b/regression/Makefile @@ -111,7 +111,7 @@ vsim-bmark-tests: $(VSIM_BMARK_TEST_STAMPS) vsim-regression-tests: $(VSIM_REGRESSION_TEST_STAMPS) vsim-torture: $(VSIM_TORTURE_STAMPS) -submodule_names = chisel3 context-dependent-environments firrtl torture hardfloat $(ROCKETCHIP_ADDONS) +submodule_names = chisel3 firrtl torture hardfloat $(ROCKETCHIP_ADDONS) # Checks out all the rocket-chip submodules stamps/other-submodules.stamp: