caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ice40/pack/SB_PLL: Force fixed value to 4'b1111 if dynamic delay is used

Browse Source 
It's been confirmed that :
 (1) this is required by the hardware
 (2) icecube will force that field to 4'b1111 in fixed mode

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
This commit is contained in:
Sylvain Munaut 2020-11-10 10:24:25 +01:00
parent 76ffdbbbde
commit bdc95b8dc0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ice40/pack.cc
View File

@ -1304,17 +1304,19 @@ static void pack_special(Context *ctx)
log_error("Invalid PLL output selection '%s'\n", param.second.as_string().c_str()); log_error("Invalid PLL output selection '%s'\n", param.second.as_string().c_str());
packed->params[pos_map_name.at(param.first)] = pos_map_val.at(param.second.as_string()); packed->params[pos_map_name.at(param.first)] = pos_map_val.at(param.second.as_string());
} }
const std::map<IdString, IdString> delmodes = { const std::map<IdString, std::pair<IdString, IdString>> delmodes = {
{ctx->id("DELAY_ADJUSTMENT_MODE_FEEDBACK"), ctx->id("DELAY_ADJMODE_FB")}, {ctx->id("DELAY_ADJUSTMENT_MODE_FEEDBACK"), {ctx->id("DELAY_ADJMODE_FB"), ctx->id("FDA_FEEDBACK")}},
{ctx->id("DELAY_ADJUSTMENT_MODE_RELATIVE"), ctx->id("DELAY_ADJMODE_REL")}, {ctx->id("DELAY_ADJUSTMENT_MODE_RELATIVE"),
{ctx->id("DELAY_ADJMODE_REL"), ctx->id("FDA_RELATIVE")}},
}; };
for (auto delmode : delmodes) { for (auto delmode : delmodes) {
if (ci->params.count(delmode.first)) { if (ci->params.count(delmode.first)) {
std::string value = str_or_default(ci->params, delmode.first, ""); std::string value = str_or_default(ci->params, delmode.first, "");
if (value == "DYNAMIC") if (value == "DYNAMIC") {
packed->params[delmode.second] = 1; packed->params[delmode.second.first] = 1;
else if (value == "FIXED") packed->params[delmode.second.second] = 15;
packed->params[delmode.second] = 0; } else if (value == "FIXED")
packed->params[delmode.second.first] = 0;
else else
log_error("Invalid PLL %s selection '%s'\n", delmode.first.c_str(ctx), value.c_str()); log_error("Invalid PLL %s selection '%s'\n", delmode.first.c_str(ctx), value.c_str());
} }