diff options
| author | David Shah <dave@ds0.me> | 2021-01-28 12:53:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-28 12:53:03 +0000 |
| commit | b671d8f59d425b6faf07167b7360cecd12366151 (patch) | |
| tree | 552ddbb947435eb5e3c44940a16d3733697766b2 /ice40/pack.cc | |
| parent | a95d6678b1d353a1606e377e1833dec54ad4ee65 (diff) | |
| parent | b87ab0ee9de093b5302de7997e94e10dae6655b4 (diff) | |
| download | nextpnr-b671d8f59d425b6faf07167b7360cecd12366151.tar.gz nextpnr-b671d8f59d425b6faf07167b7360cecd12366151.tar.bz2 nextpnr-b671d8f59d425b6faf07167b7360cecd12366151.zip | |
Merge pull request #553 from YosysHQ/rel-slice
Switch from RelPtr to RelSlice
Diffstat (limited to 'ice40/pack.cc')
| -rw-r--r-- | ice40/pack.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ice40/pack.cc b/ice40/pack.cc index 9eb7d7c1..bac8e170 100644 --- a/ice40/pack.cc +++ b/ice40/pack.cc @@ -1357,14 +1357,11 @@ void pack_plls(Context *ctx) auto feedback_path = packed->params[ctx->id("FEEDBACK_PATH")].is_string ? packed->params[ctx->id("FEEDBACK_PATH")].as_string() : std::to_string(packed->params[ctx->id("FEEDBACK_PATH")].as_int64()); - std::string fbp_value = - feedback_path == "DELAY" - ? "0" - : feedback_path == "SIMPLE" - ? "1" - : feedback_path == "PHASE_AND_DELAY" - ? "2" - : feedback_path == "EXTERNAL" ? "6" : std::string(feedback_path); + std::string fbp_value = feedback_path == "DELAY" ? "0" + : feedback_path == "SIMPLE" ? "1" + : feedback_path == "PHASE_AND_DELAY" ? "2" + : feedback_path == "EXTERNAL" ? "6" + : std::string(feedback_path); if (!std::all_of(fbp_value.begin(), fbp_value.end(), isdigit)) log_error("PLL '%s' has unsupported FEEDBACK_PATH value '%s'\n", ci->name.c_str(ctx), feedback_path.c_str()); |