diff options
| author | gatecat <gatecat@ds0.me> | 2021-04-29 10:50:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-29 10:50:28 +0100 |
| commit | d718ccaa78763300146f0b8e5f2339b7fba97542 (patch) | |
| tree | fd9cdcbf398c61efacc5b82c859110372e776b43 /ecp5/bitstream.cc | |
| parent | b7bf7c11a841adeb6e9f4ca7364cbb63367be962 (diff) | |
| parent | d3a6cf3ae7ed0ce23e95db1fb1a5c6c2b72fc5a2 (diff) | |
| download | nextpnr-d718ccaa78763300146f0b8e5f2339b7fba97542.tar.gz nextpnr-d718ccaa78763300146f0b8e5f2339b7fba97542.tar.bz2 nextpnr-d718ccaa78763300146f0b8e5f2339b7fba97542.zip | |
Merge pull request #689 from adamgreig/ecp5-alu
ECP5 ALU54B placement support
Diffstat (limited to 'ecp5/bitstream.cc')
| -rw-r--r-- | ecp5/bitstream.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ecp5/bitstream.cc b/ecp5/bitstream.cc index af7c63f8..7db0e020 100644 --- a/ecp5/bitstream.cc +++ b/ecp5/bitstream.cc @@ -1171,7 +1171,7 @@ void write_bitstream(Context *ctx, std::string base_config_file, std::string tex tg.config.add_enum(dsp + ".RESETMODE", str_or_default(ci->params, ctx->id("RESETMODE"), "SYNC")); tg.config.add_enum(dsp + ".MODE", "MULT18X18D"); - if (str_or_default(ci->params, ctx->id("REG_OUTPUT_CLK"), "NONE") == "NONE") + if (str_or_default(ci->params, ctx->id("REG_OUTPUT_CLK"), "NONE") == "NONE" && ci->constr_parent == nullptr) tg.config.add_enum(dsp + ".CIBOUT_BYP", "ON"); if (loc.z < 4) @@ -1209,6 +1209,8 @@ void write_bitstream(Context *ctx, std::string base_config_file, std::string tex str_or_default(ci->params, ctx->id("REG_OPCODEOP1_0_CLK"), "NONE")); tg.config.add_enum(dsp + ".REG_OPCODEOP0_1_CLK", str_or_default(ci->params, ctx->id("REG_OPCODEOP0_1_CLK"), "NONE")); + tg.config.add_enum(dsp + ".REG_OPCODEOP1_1_CLK", + str_or_default(ci->params, ctx->id("REG_OPCODEOP1_1_CLK"), "NONE")); tg.config.add_enum(dsp + ".REG_OPCODEOP0_1_CE", str_or_default(ci->params, ctx->id("REG_OPCODEOP0_1_CE"), "CE0")); tg.config.add_enum(dsp + ".REG_OPCODEOP0_1_RST", |