diff options
| author | Eddie Hung <e.hung@imperial.ac.uk> | 2018-07-25 17:55:20 -0700 |
|---|---|---|
| committer | Eddie Hung <e.hung@imperial.ac.uk> | 2018-07-25 17:55:20 -0700 |
| commit | a21cc4dd5bbbf1c9e5894d8c30a2c3252d21dfd0 (patch) | |
| tree | ea93dcd47f9e84145ba66de353e1848ebc34cbf5 /ice40/pack.cc | |
| parent | 7c8c13aba14ee51851506e0c1cfc0c995db21102 (diff) | |
| parent | f78a74b9cff79a41f992cfaf20deb88054ea27a6 (diff) | |
| download | nextpnr-a21cc4dd5bbbf1c9e5894d8c30a2c3252d21dfd0.tar.gz nextpnr-a21cc4dd5bbbf1c9e5894d8c30a2c3252d21dfd0.tar.bz2 nextpnr-a21cc4dd5bbbf1c9e5894d8c30a2c3252d21dfd0.zip | |
Merge remote-tracking branch 'origin/master' into redist_slack
Diffstat (limited to 'ice40/pack.cc')
| -rw-r--r-- | ice40/pack.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ice40/pack.cc b/ice40/pack.cc index 91dcf846..8182eb70 100644 --- a/ice40/pack.cc +++ b/ice40/pack.cc @@ -662,12 +662,12 @@ static void pack_special(Context *ctx) auto feedback_path = packed->params[ctx->id("FEEDBACK_PATH")]; packed->params[ctx->id("FEEDBACK_PATH")] = - feedback_path == "DELAY" - ? "0" - : feedback_path == "SIMPLE" ? "1" - : feedback_path == "PHASE_AND_DELAY" - ? "2" - : feedback_path == "EXTERNAL" ? "6" : feedback_path; + feedback_path == "DELAY" ? "0" : feedback_path == "SIMPLE" + ? "1" + : feedback_path == "PHASE_AND_DELAY" + ? "2" + : feedback_path == "EXTERNAL" ? "6" + : feedback_path; packed->params[ctx->id("PLLTYPE")] = std::to_string(sb_pll40_type(ctx, ci)); NetInfo *pad_packagepin_net = nullptr; |