diff options
| author | gatecat <gatecat@ds0.me> | 2021-07-20 16:08:26 +0100 |
|---|---|---|
| committer | gatecat <gatecat@ds0.me> | 2021-07-20 16:08:26 +0100 |
| commit | 8f722a0d3550a3398e08caebeb7efd2a2d006cb2 (patch) | |
| tree | 5aa931fca5d810d7a2dee984647487e90fc00317 | |
| parent | f3be638ea9536511d329d3e1ad726e847916f122 (diff) | |
| download | nextpnr-8f722a0d3550a3398e08caebeb7efd2a2d006cb2.tar.gz nextpnr-8f722a0d3550a3398e08caebeb7efd2a2d006cb2.tar.bz2 nextpnr-8f722a0d3550a3398e08caebeb7efd2a2d006cb2.zip | |
ice40: Use default value when IP is missing BUS_ADDR74 parameter
Signed-off-by: gatecat <gatecat@ds0.me>
| -rw-r--r-- | ice40/pack.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ice40/pack.cc b/ice40/pack.cc index 67c3dbb7..0db78992 100644 --- a/ice40/pack.cc +++ b/ice40/pack.cc @@ -1271,11 +1271,12 @@ static void pack_special(Context *ctx) {std::make_tuple(id_SB_SPI, "0b0010"), Loc(25, 0, 1)}, {std::make_tuple(id_SB_I2C, "0b0011"), Loc(25, 31, 0)}, }; - if (map_ba74.find(std::make_tuple(ci->type, ci->params[ctx->id("BUS_ADDR74")].as_string())) == - map_ba74.end()) + std::string bus_addr74 = + str_or_default(ci->params, ctx->id("BUS_ADDR74"), is_sb_i2c(ctx, ci) ? "0b0001" : "0b0000"); + if (map_ba74.find(std::make_tuple(ci->type, bus_addr74)) == map_ba74.end()) log_error("Invalid value for BUS_ADDR74 for cell '%s' of type '%s'\n", ci->name.c_str(ctx), ci->type.c_str(ctx)); - Loc bel_loc = map_ba74.at(std::make_tuple(ci->type, ci->params[ctx->id("BUS_ADDR74")].as_string())); + Loc bel_loc = map_ba74.at(std::make_tuple(ci->type, bus_addr74)); BelId bel = ctx->getBelByLocation(bel_loc); if (bel == BelId() || ctx->getBelType(bel) != ci->type) log_error("Unable to find placement for cell '%s' of type '%s'\n", ci->name.c_str(ctx), |