diff options
| author | David Shah <dave@ds0.me> | 2019-08-07 10:40:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-07 10:40:25 +0100 |
| commit | eaef3b600e2e8c4633db25edd4ad017b59a1cc79 (patch) | |
| tree | 66a6e88614d99dfdf8c15ac3a1d1a13339784f9c /generic/pack.cc | |
| parent | 1ecf271cb32f9f78ea082788c6534f2523144d01 (diff) | |
| parent | 8eef6ac55e48aa181d1e268fcec004a58f9d8db4 (diff) | |
| download | nextpnr-eaef3b600e2e8c4633db25edd4ad017b59a1cc79.tar.gz nextpnr-eaef3b600e2e8c4633db25edd4ad017b59a1cc79.tar.bz2 nextpnr-eaef3b600e2e8c4633db25edd4ad017b59a1cc79.zip | |
Merge pull request #306 from YosysHQ/dave/jsonfix
Major improvements to constants/Property
Diffstat (limited to 'generic/pack.cc')
| -rw-r--r-- | generic/pack.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/pack.cc b/generic/pack.cc index 558eca7c..3dc12bc1 100644 --- a/generic/pack.cc +++ b/generic/pack.cc @@ -150,7 +150,7 @@ static void pack_constants(Context *ctx) log_info("Packing constants..\n"); std::unique_ptr<CellInfo> gnd_cell = create_generic_cell(ctx, ctx->id("GENERIC_SLICE"), "$PACKER_GND"); - gnd_cell->params[ctx->id("INIT")] = "0"; + gnd_cell->params[ctx->id("INIT")] = 0; std::unique_ptr<NetInfo> gnd_net = std::unique_ptr<NetInfo>(new NetInfo); gnd_net->name = ctx->id("$PACKER_GND_NET"); gnd_net->driver.cell = gnd_cell.get(); @@ -158,7 +158,7 @@ static void pack_constants(Context *ctx) gnd_cell->ports.at(ctx->id("Q")).net = gnd_net.get(); std::unique_ptr<CellInfo> vcc_cell = create_generic_cell(ctx, ctx->id("GENERIC_SLICE"), "$PACKER_VCC"); - vcc_cell->params[ctx->id("INIT")] = "1"; + vcc_cell->params[ctx->id("INIT")] = 1; std::unique_ptr<NetInfo> vcc_net = std::unique_ptr<NetInfo>(new NetInfo); vcc_net->name = ctx->id("$PACKER_VCC_NET"); vcc_net->driver.cell = vcc_cell.get(); @@ -282,7 +282,7 @@ bool Arch::pack() pack_io(ctx); pack_lut_lutffs(ctx); pack_nonlut_ffs(ctx); - ctx->settings[ctx->id("pack")] = "1"; + ctx->settings[ctx->id("pack")] = 1; ctx->assignArchInfo(); log_info("Checksum: 0x%08x\n", ctx->checksum()); return true; |