diff options
author | Eddie Hung <eddie@fpgeh.com> | 2020-01-28 10:17:47 -0800 |
---|---|---|
committer | Eddie Hung <eddie@fpgeh.com> | 2020-01-28 10:17:47 -0800 |
commit | 245b8c4ab64c5c3bd7b9f71f94316a76a2576fd1 (patch) | |
tree | c5932c507f7f2817037fad178f50229e6e6400f0 | |
parent | 4ddaa70fd6363096bf0cb1bc5e7cb8fa8ed21ad2 (diff) | |
download | yosys-245b8c4ab64c5c3bd7b9f71f94316a76a2576fd1.tar.gz yosys-245b8c4ab64c5c3bd7b9f71f94316a76a2576fd1.tar.bz2 yosys-245b8c4ab64c5c3bd7b9f71f94316a76a2576fd1.zip |
Fix unresolved conflict from #1573
-rw-r--r-- | techlibs/xilinx/synth_xilinx.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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"); |