From: Eddie Hung <eddie@fpgeh.com>
Date: Fri, 30 Aug 2019 16:50:20 +0000 (-0700)
Subject: Merge branch 'xc7dsp' of github.com:YosysHQ/yosys into xc7dsp
X-Git-Tag: working-ls180~1039^2~229
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=295c18bd6b8d3fa503041904f7f7df392a4b5167;p=yosys.git

Merge branch 'xc7dsp' of github.com:YosysHQ/yosys into xc7dsp
---

295c18bd6b8d3fa503041904f7f7df392a4b5167
diff --cc techlibs/xilinx/synth_xilinx.cc
index 26d01ce40,2bd8570ec..5e491b86b
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@@ -107,7 -118,9 +118,8 @@@ struct SynthXilinxPass : public ScriptP
  	}
  
  	std::string top_opt, edif_file, blif_file, family;
- 	bool flatten, retime, vpr, nobram, nolutram, nosrl, nocarry, nowidelut, nodsp, abc9;
 -	bool flatten, retime, vpr, nobram, nodram, nosrl, nocarry, nowidelut, nodsp, abc9;
+ 	bool flatten, retime, vpr, ise, iopad, noiopad, noclkbuf, nobram, nolutram, nosrl, nocarry, nowidelut, nodsp, abc9;
+ 	bool flatten_before_abc;
  	int widemux;
  
  	void clear_flags() YS_OVERRIDE