diff options
| author | David Shah <dave@ds0.me> | 2019-12-27 11:19:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-27 11:19:45 +0000 |
| commit | 4e0ca50db137eb9d10098582be607c98601f8375 (patch) | |
| tree | 7dd586694d7c3bca458502f3e6d677da1a6954b3 /ice40/pack.cc | |
| parent | b6e2159cecdf79d0d94d0e6a9dda8cef6389cac1 (diff) | |
| parent | 5774b13984bb151909b90ee2c668bdfb08387a2b (diff) | |
| download | nextpnr-4e0ca50db137eb9d10098582be607c98601f8375.tar.gz nextpnr-4e0ca50db137eb9d10098582be607c98601f8375.tar.bz2 nextpnr-4e0ca50db137eb9d10098582be607c98601f8375.zip | |
Merge pull request #353 from YosysHQ/generic-frontend
New hierarchy-capable generic frontend framework and json11 based JSON frontend
Diffstat (limited to 'ice40/pack.cc')
| -rw-r--r-- | ice40/pack.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ice40/pack.cc b/ice40/pack.cc index 90c6de31..5b13e9ee 100644 --- a/ice40/pack.cc +++ b/ice40/pack.cc @@ -527,7 +527,9 @@ static void pack_io(Context *ctx) std::copy(ci->attrs.begin(), ci->attrs.end(), std::inserter(sb->attrs, sb->attrs.begin())); } else if (is_sb_io(ctx, ci) || is_sb_gb_io(ctx, ci)) { NetInfo *net = ci->ports.at(ctx->id("PACKAGE_PIN")).net; - if ((net != nullptr) && (net->users.size() > 1)) + if ((net != nullptr) && ((net->users.size() > 2) || + (net->driver.cell != nullptr && + net->driver.cell->type == ctx->id("$nextpnr_obuf") && net->users.size() > 1))) log_error("PACKAGE_PIN of %s '%s' connected to more than a single top level IO.\n", ci->type.c_str(ctx), ci->name.c_str(ctx)); } @@ -1485,6 +1487,7 @@ bool Arch::pack() promote_globals(ctx); ctx->assignArchInfo(); constrain_chains(ctx); + ctx->fixupHierarchy(); ctx->assignArchInfo(); ctx->settings[ctx->id("pack")] = 1; archInfoToAttributes(); |