diff options
| author | David Shah <dave@ds0.me> | 2020-11-10 10:03:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 10:03:45 +0000 |
| commit | cf331ca2a7fa92d3414fabf003ce6fc7b515f76b (patch) | |
| tree | 446481f9a99defb8bf0297ceb3df47123b6eb93e | |
| parent | 76ffdbbbdedcaa0c07af3b5f8abe881f4722605f (diff) | |
| parent | bdc95b8dc0a8244e94bbc1a1feec5040d906b9c1 (diff) | |
| download | nextpnr-cf331ca2a7fa92d3414fabf003ce6fc7b515f76b.tar.gz nextpnr-cf331ca2a7fa92d3414fabf003ce6fc7b515f76b.tar.bz2 nextpnr-cf331ca2a7fa92d3414fabf003ce6fc7b515f76b.zip | |
Merge pull request #512 from smunaut/fix-pll-dynamic-delay
ice40/pack/SB_PLL: Force fixed value to 4'b1111 if dynamic delay is used
| -rw-r--r-- | ice40/pack.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/ice40/pack.cc b/ice40/pack.cc index b8783953..22d75bc3 100644 --- a/ice40/pack.cc +++ b/ice40/pack.cc @@ -1304,17 +1304,19 @@ static void pack_special(Context *ctx) log_error("Invalid PLL output selection '%s'\n", param.second.as_string().c_str()); packed->params[pos_map_name.at(param.first)] = pos_map_val.at(param.second.as_string()); } - const std::map<IdString, IdString> delmodes = { - {ctx->id("DELAY_ADJUSTMENT_MODE_FEEDBACK"), ctx->id("DELAY_ADJMODE_FB")}, - {ctx->id("DELAY_ADJUSTMENT_MODE_RELATIVE"), ctx->id("DELAY_ADJMODE_REL")}, + const std::map<IdString, std::pair<IdString, IdString>> delmodes = { + {ctx->id("DELAY_ADJUSTMENT_MODE_FEEDBACK"), {ctx->id("DELAY_ADJMODE_FB"), ctx->id("FDA_FEEDBACK")}}, + {ctx->id("DELAY_ADJUSTMENT_MODE_RELATIVE"), + {ctx->id("DELAY_ADJMODE_REL"), ctx->id("FDA_RELATIVE")}}, }; for (auto delmode : delmodes) { if (ci->params.count(delmode.first)) { std::string value = str_or_default(ci->params, delmode.first, ""); - if (value == "DYNAMIC") - packed->params[delmode.second] = 1; - else if (value == "FIXED") - packed->params[delmode.second] = 0; + if (value == "DYNAMIC") { + packed->params[delmode.second.first] = 1; + packed->params[delmode.second.second] = 15; + } else if (value == "FIXED") + packed->params[delmode.second.first] = 0; else log_error("Invalid PLL %s selection '%s'\n", delmode.first.c_str(ctx), value.c_str()); } |