common.mk: Yosys compatible output can be generated by firtool withou…

…t invoking SFC before MFC

Signed-off-by: Øyvind Harboe <[email protected]>

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