diff --git a/common.mk b/common.mk index e6cd1404..c0893453 100644 --- a/common.mk +++ b/common.mk @@ -18,7 +18,7 @@ HELP_COMPILATION_VARIABLES += \ " EXTRA_SIM_REQS = additional make requirements to build the simulator" \ " ENABLE_SBT_THIN_CLIENT = if set, use sbt's experimental thin client (works best when overridding SBT_BIN with the mainline sbt script)" \ " ENABLE_CUSTOM_FIRRTL_PASS = if set, enable custom firrtl passes (SFC lowers to LowFIRRTL & MFC converts to Verilog)" \ -" ENABLE_VLSI_FLOW = if set, add compilation flags to enable the vlsi flow for hammer \ +" ENABLE_YOSYS_FLOW = if set, add compilation flags to enable the vlsi flow for yosys(tutorial flow) \ " EXTRA_CHISEL_OPTIONS = additional options to pass to the Chisel compiler" \ " EXTRA_FIRRTL_OPTIONS = additional options to pass to the FIRRTL compiler" @@ -27,7 +27,7 @@ EXTRA_SIM_CXXFLAGS ?= EXTRA_SIM_LDFLAGS ?= EXTRA_SIM_SOURCES ?= EXTRA_SIM_REQS ?= -ENABLE_CUSTOM_FIRRTL_PASS += $(ENABLE_VLSI_FLOW) +ENABLE_CUSTOM_FIRRTL_PASS += $(ENABLE_YOSYS_FLOW) #---------------------------------------------------------------------------- HELP_SIMULATION_VARIABLES += \ @@ -182,7 +182,7 @@ else $(eval SFC_LEVEL := low) $(eval EXTRA_FIRRTL_OPTIONS += $(SFC_REPL_SEQ_MEM)) endif -ifeq (,$(ENABLE_VLSI_FLOW)) +ifeq (,$(ENABLE_YOSYS_FLOW)) $(eval MFC_LOWERING_OPTIONS = $(MFC_BASE_LOWERING_OPTIONS)) else $(eval MFC_LOWERING_OPTIONS = $(MFC_BASE_LOWERING_OPTIONS),disallowPackedArrays) diff --git a/vlsi/Makefile b/vlsi/Makefile index f54067e3..ab8438d5 100644 --- a/vlsi/Makefile +++ b/vlsi/Makefile @@ -51,8 +51,6 @@ else OBJ_DIR ?= $(vlsi_dir)/$(VLSI_OBJ_DIR)/$(long_name)-$(VLSI_TOP) endif -ENABLE_VLSI_FLOW ?= 1 - ######################################################################################### # general rules #########################################################################################