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

different oscilator for XO3D

Browse Source
This commit is contained in:
Miodrag Milanovic 2023-05-25 14:28:15 +02:00 committed by myrtle
parent 679b662a2b
commit 83f65169a3
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
machxo2/bitstream.cc
View File

@ -693,6 +693,10 @@ struct MachXO2Bitgen
std::string freq = str_or_default(ci->params, id_NOM_FREQ, "2.08"); std::string freq = str_or_default(ci->params, id_NOM_FREQ, "2.08");
cc.tiles[ctx->get_tile_by_type("CFG1")].add_enum("OSCH.MODE", "OSCH"); cc.tiles[ctx->get_tile_by_type("CFG1")].add_enum("OSCH.MODE", "OSCH");
cc.tiles[ctx->get_tile_by_type("CFG1")].add_enum("OSCH.NOM_FREQ", freq); cc.tiles[ctx->get_tile_by_type("CFG1")].add_enum("OSCH.NOM_FREQ", freq);
} else if (ci->type == id_OSCJ) {
std::string freq = str_or_default(ci->params, id_NOM_FREQ, "2.08");
cc.tiles[ctx->get_tile_by_type("CFG1")].add_enum("OSCJ.MODE", "OSCJ");
cc.tiles[ctx->get_tile_by_type("CFG1")].add_enum("OSCJ.NOM_FREQ", freq);
} else if (ci->type == id_DCCA) { } else if (ci->type == id_DCCA) {
write_dcc(ci); write_dcc(ci);
} else if (ci->type == id_DP8KC) { } else if (ci->type == id_DP8KC) {

3
machxo2/constids.inc
View File

@ -649,3 +649,6 @@ X(RXDA4)
X(RXDA5) X(RXDA5)
X(RXDA6) X(RXDA6)
X(RXDA7) X(RXDA7)
X(OSCJ)
X(OSCESB)

8
machxo2/pack.cc
View File

@ -1143,8 +1143,8 @@ class MachXO2Packer
simple_clk_contraint(vco_period * int_or_default(ci->params, id_CLKOS2_DIV, 1))); simple_clk_contraint(vco_period * int_or_default(ci->params, id_CLKOS2_DIV, 1)));
set_constraint(ci, id_CLKOS3, set_constraint(ci, id_CLKOS3,
simple_clk_contraint(vco_period * int_or_default(ci->params, id_CLKOS3_DIV, 1))); simple_clk_contraint(vco_period * int_or_default(ci->params, id_CLKOS3_DIV, 1)));
} else if (ci->type == id_OSCH) { } else if (ci->type == id_OSCH || ci->type == id_OSCJ) {
static std::string const osch_freq[] = { static std::string const osc_freq[] = {
"2.08", "2.15", "2.22", "2.29", "2.38", "2.46", "2.56", "2.66", "2.77", "2.89", "2.08", "2.15", "2.22", "2.29", "2.38", "2.46", "2.56", "2.66", "2.77", "2.89",
"3.02", "3.17", "3.33", "3.50", "3.69", "3.91", "4.16", "4.29", "4.43", "4.59", "3.02", "3.17", "3.33", "3.50", "3.69", "3.91", "4.16", "4.29", "4.43", "4.59",
"4.75", "4.93", "5.12", "5.32", "5.54", "5.78", "6.05", "6.33", "6.65", "7.00", "4.75", "4.93", "5.12", "5.32", "5.54", "5.78", "6.05", "6.33", "6.65", "7.00",
@ -1156,14 +1156,14 @@ class MachXO2Packer
std::string freq = str_or_default(ci->params, id_NOM_FREQ, "2.08"); std::string freq = str_or_default(ci->params, id_NOM_FREQ, "2.08");
bool found = false; bool found = false;
for (int i = 0; i < 64; i++) { for (int i = 0; i < 64; i++) {
if (osch_freq[i] == freq) { if (osc_freq[i] == freq) {
found = true; found = true;
set_constraint(ci, id_OSC, simple_clk_contraint(delay_t(1000.0 / std::stof(freq)))); set_constraint(ci, id_OSC, simple_clk_contraint(delay_t(1000.0 / std::stof(freq))));
break; break;
} }
} }
if (!found) if (!found)
log_error("Unsupported frequency '%s' on OSCH '%s'\n", freq.c_str(), ci->name.c_str(ctx)); log_error("Unsupported frequency '%s' on %s '%s'\n", freq.c_str(), ci->type == id_OSCH ? "OSCH" : "OSCJ", ci->name.c_str(ctx));
} }
} }
} }