diff options
| author | David Shah <dave@ds0.me> | 2019-11-29 10:56:04 +0000 |
|---|---|---|
| committer | David Shah <dave@ds0.me> | 2019-11-29 10:56:04 +0000 |
| commit | 1c1c096861d553f1fc71d7db3652af25b980b219 (patch) | |
| tree | 9139aa1437724dc83d8ecafc0867318a8e0083bc /ecp5 | |
| parent | ff30bc87fed024189a49bc372b1db0bde6db29f2 (diff) | |
| download | nextpnr-1c1c096861d553f1fc71d7db3652af25b980b219.tar.gz nextpnr-1c1c096861d553f1fc71d7db3652af25b980b219.tar.bz2 nextpnr-1c1c096861d553f1fc71d7db3652af25b980b219.zip | |
ecp5: Fix 25k DDRDLLA bitstream gen
Signed-off-by: David Shah <dave@ds0.me>
Diffstat (limited to 'ecp5')
| -rw-r--r-- | ecp5/arch.h | 2 | ||||
| -rw-r--r-- | ecp5/bitstream.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ecp5/arch.h b/ecp5/arch.h index 3df2d84f..5e5fc3e4 100644 --- a/ecp5/arch.h +++ b/ecp5/arch.h @@ -1029,7 +1029,7 @@ struct Arch : BaseCtx if (chip_info->tiletype_names[tileloc.tile_names[j].type_idx].get() == type) return tileloc.tile_names[j].name.get(); } - NPNR_ASSERT_FALSE_STR("no with type " + type); + NPNR_ASSERT_FALSE_STR("no tile with type " + type); } GlobalInfoPOD globalInfoAtLoc(Location loc); diff --git a/ecp5/bitstream.cc b/ecp5/bitstream.cc index b491bf75..9b1a65ab 100644 --- a/ecp5/bitstream.cc +++ b/ecp5/bitstream.cc @@ -1397,8 +1397,9 @@ void write_bitstream(Context *ctx, std::string base_config_file, std::string tex Loc loc = ctx->getBelLocation(ci->bel); bool u = loc.y<15, r = loc.x> 15; std::string tiletype = fmt_str("DDRDLL_" << (u ? 'U' : 'L') << (r ? 'R' : 'L')); - if (ctx->args.type == ArchArgs::LFE5U_25F || ctx->args.type == ArchArgs::LFE5UM_25F || - ctx->args.type == ArchArgs::LFE5UM5G_25F) + if ((ctx->args.type == ArchArgs::LFE5U_25F || ctx->args.type == ArchArgs::LFE5UM_25F || + ctx->args.type == ArchArgs::LFE5UM5G_25F) && + u) tiletype += "A"; std::string tile = ctx->getTileByType(tiletype); cc.tiles[tile].add_enum("DDRDLL.MODE", "DDRDLLA"); |