From 245b8c4ab64c5c3bd7b9f71f94316a76a2576fd1 Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Tue, 28 Jan 2020 10:17:47 -0800 Subject: Fix unresolved conflict from #1573 --- techlibs/xilinx/synth_xilinx.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'techlibs/xilinx/synth_xilinx.cc') diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc index 5ba8c0e10..3c5599e4e 100644 --- a/techlibs/xilinx/synth_xilinx.cc +++ b/techlibs/xilinx/synth_xilinx.cc @@ -318,7 +318,7 @@ struct SynthXilinxPass : public ScriptPass run("flatten", "(with '-flatten')"); active_design->scratchpad_unset("tribuf.added_something"); run("tribuf -logic"); - if (!do_iopad && active_design->scratchpad_get_bool("tribuf.added_something")) + if (noiopad && active_design->scratchpad_get_bool("tribuf.added_something")) log_error("Tristate buffers are unsupported without the '-iopad' option.\n"); run("deminout"); run("opt_expr"); -- cgit v1.2.3