From 256258cbe90e45f6d6277ecaf37c5f16fa89653e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Harboe?= Date: Mon, 13 Nov 2023 12:26:59 +0100 Subject: [PATCH] common.mk: Yosys compatible output can be generated by firtool without invoking SFC before MFC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Øyvind Harboe --- common.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common.mk b/common.mk index f6bc19c141..6ec4a71141 100644 --- a/common.mk +++ b/common.mk @@ -28,7 +28,6 @@ EXTRA_SIM_CXXFLAGS ?= EXTRA_SIM_LDFLAGS ?= EXTRA_SIM_SOURCES ?= EXTRA_SIM_REQS ?= -ENABLE_CUSTOM_FIRRTL_PASS += $(ENABLE_YOSYS_FLOW) ifneq ($(ASPECTS), ) comma = , @@ -191,6 +190,12 @@ SFC_MFC_TARGETS = \ SFC_REPL_SEQ_MEM = --infer-rw --repl-seq-mem -c:$(MODEL):-o:$(SFC_SMEMS_CONF) MFC_BASE_LOWERING_OPTIONS ?= emittedLineLength=2048,noAlwaysComb,disallowLocalVariables,verifLabels,locationInfoStyle=wrapInAtSquareBracket +ifeq ($(ENABLE_YOSYS_FLOW),) + ifneq ($(MFC_BASE_LOWERING_OPTIONS),) + MFC_BASE_LOWERING_OPTIONS += , + endif + MFC_BASE_LOWERING_OPTIONS += disallowPackedArrays +endif # DOC include start: FirrtlCompiler # There are two possible cases for this step. In the first case, SFC