From: Eddie Hung <eddie@fpgeh.com>
Date: Thu, 27 Jun 2019 18:23:30 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/xaig' into xc7mux
X-Git-Tag: working-ls180~1208^2~52
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4d00e27ed76e05d9356573bc20d73874c3e780d7;p=yosys.git

Merge remote-tracking branch 'origin/xaig' into xc7mux
---

4d00e27ed76e05d9356573bc20d73874c3e780d7
diff --cc techlibs/xilinx/synth_xilinx.cc
index 2f3dfb012,7dbd98055..c72c0ba8c
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@@ -104,9 -100,8 +105,9 @@@ struct SynthXilinxPass : public ScriptP
  		log("\n");
  	}
  
- 	std::string top_opt, edif_file, blif_file, arch;
+ 	std::string top_opt, edif_file, blif_file, family;
  	bool flatten, retime, vpr, nobram, nodram, nosrl, nocarry, nowidelut, abc9;
 +	int widemux;
  
  	void clear_flags() YS_OVERRIDE
  	{
@@@ -207,12 -197,9 +208,12 @@@
  		}
  		extra_args(args, argidx, design);
  
- 		if (arch != "xcup" && arch != "xcu" && arch != "xc7" && arch != "xc6s")
- 			log_cmd_error("Invalid Xilinx -arch setting: %s\n", arch.c_str());
+ 		if (family != "xcup" && family != "xcu" && family != "xc7" && family != "xc6s")
+ 			log_cmd_error("Invalid Xilinx -family setting: %s\n", family.c_str());
  
 +		if (widemux != 0 && widemux < 5)
 +			log_cmd_error("-widemux value must be 0 or >= 5.\n");
 +
  		if (!design->full_selection())
  			log_cmd_error("This command only operates on fully selected designs!\n");