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

Use correct names for IDDRX1_ODDRX1 FASM features

Browse Source 
Signed-off-by: Maciej Kurc <mkurc@antmicro.com>
This commit is contained in:
Maciej Kurc 2021-09-17 15:52:56 +02:00
parent ef9eee6b15
commit 8ffd30cb2d
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nexus/fasm.cc
View File

@ -567,15 +567,11 @@ struct NexusFasmWriter
push_bel(bel); push_bel(bel);
write_enum(cell, "MODE"); write_enum(cell, "MODE");
write_enum(cell, "IDDRX1_ODDRX1.OUTPUT"); write_enum(cell, "IDDRX1_ODDRX1.OUTPUT");
write_enum(cell, "IDDRX1_ODDRX1.TRISTATE");
write_enum(cell, "GSR", "DISABLED"); write_enum(cell, "GSR", "DISABLED");
write_enum(cell, "TSREG.REGSET", "RESET"); write_enum(cell, "TSREG.REGSET", "RESET");
write_cell_muxes(cell); write_cell_muxes(cell);
pop(); pop();
// FIXME: Workaround for unknown bits
push_tile(bel.tile);
write_enum(cell, "UNKNOWN");
pop();
} }
// Write config for some kind of DSP cell // Write config for some kind of DSP cell

20
nexus/pack.cc
View File

@ -2276,24 +2276,10 @@ struct NexusPacker
iol->params[id_SRMODE] = ff->params.at(id_SRMODE); iol->params[id_SRMODE] = ff->params.at(id_SRMODE);
iol->params[id_REGSET] = ff->params.at(id_REGSET); iol->params[id_REGSET] = ff->params.at(id_REGSET);
iol->params[ctx->id("TSREG.REGSET")] = std::string("SET"); // Enable the TSREG
// CEOUTMUX.1
iol->params[ctx->id("CEOUTMUX")] = std::string("1"); iol->params[ctx->id("CEOUTMUX")] = std::string("1");
iol->params[ctx->id("TSREG.REGSET")] = std::string("SET");
// FIXME: Workaround for an unknown bit iol->params[ctx->id("IDDRX1_ODDRX1.TRISTATE")] = std::string("ENABLED");
IdStringList belName = IdStringList::parse(ctx, iob->attrs[id_BEL].as_string());
if (belName[2] == ctx->id("PIOA")) {
// UNKNOWN.22.1 for A
iol->params[ctx->id("UNKNOWN")] = std::string("22.1");
}
else if (belName[2] == ctx->id("PIOB")) {
// UNKNOWN.77.1 for B
iol->params[ctx->id("UNKNOWN")] = std::string("77.1");
}
else {
log_error("Unknown IO BEL type '%s'\n", belName[2].c_str(ctx));
}
} }
// Disconnect the flip-flop // Disconnect the flip-flop