From: Eddie Hung <eddie@fpgeh.com>
Date: Mon, 26 Aug 2019 20:25:17 +0000 (-0700)
Subject: Merge branch 'master' into mwk/xilinx_bufgmap
X-Git-Tag: working-ls180~1097^2~2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a098205479a74ad9c1b1dcb4e0607970fb58b952;p=yosys.git

Merge branch 'master' into mwk/xilinx_bufgmap
---

a098205479a74ad9c1b1dcb4e0607970fb58b952
diff --cc techlibs/xilinx/synth_xilinx.cc
index 00849ad00,87f4af8f7..f058da83d
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@@ -116,7 -104,8 +116,8 @@@ struct SynthXilinxPass : public ScriptP
  	}
  
  	std::string top_opt, edif_file, blif_file, family;
 -	bool flatten, retime, vpr, nobram, nolutram, nosrl, nocarry, nowidelut, abc9;
 +	bool flatten, retime, vpr, ise, iopad, noiopad, noclkbuf, nobram, nolutram, nosrl, nocarry, nowidelut, abc9;
+ 	bool flatten_before_abc;
  	int widemux;
  
  	void clear_flags() YS_OVERRIDE