Merge branch 'chisel-v2' of github.com:ucb-bar/reference-chip into chisel-v2

Conflicts:
	chisel
	riscv-hwacha
	riscv-rocket
	uncore
This commit is contained in:
Henry Cook committed 2013-08-15 16:39:30 -07:00
commit 6b20556661
4 files changed
+4 -4

No files matched your search

+1 -1
View File
@@ -14,7 +14,7 @@ object DummyTopLevelConstants {
val HTIF_WIDTH = 16
val ENABLE_SHARING = true
val ENABLE_CLEAN_EXCLUSIVE = true
val HAS_VEC = true
val HAS_VEC = false
val HAS_FPU = true
val NL2_REL_XACTS = 1
val NL2_ACQ_XACTS = 8