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

Merge pull request #452 from smunaut/ice40_shiftreg_div_mode

Browse Source 
ice40: Add support for the 2nd bit of SHIFTREG_DIV_MODE
This commit is contained in:
David Shah 2020-06-02 19:55:31 +01:00 committed by GitHub
commit be50947fa6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ice40/bitstream.cc
View File

@ -133,6 +133,16 @@ static const BelConfigPOD &get_ec_config(const ChipInfoPOD *chip, BelId bel)
typedef std::vector<std::vector<std::vector<std::vector<int8_t>>>> chipconfig_t; typedef std::vector<std::vector<std::vector<std::vector<int8_t>>>> chipconfig_t;
static bool has_ec_cbit(const BelConfigPOD &cell_cbits, std::string name)
{
for (int i = 0; i < cell_cbits.num_entries; i++) {
const auto &cbit = cell_cbits.entries[i];
if (cbit.entry_name.get() == name)
return true;
}
return false;
}
static void set_ec_cbit(chipconfig_t &config, const Context *ctx, const BelConfigPOD &cell_cbits, std::string name, static void set_ec_cbit(chipconfig_t &config, const Context *ctx, const BelConfigPOD &cell_cbits, std::string name,
bool value, std::string prefix) bool value, std::string prefix)
{ {
@ -190,7 +200,7 @@ void configure_extra_cell(chipconfig_t &config, const Context *ctx, CellInfo *ce
} }
value.resize(p.second); value.resize(p.second);
if (p.second == 1) { if ((p.second == 1) || !has_ec_cbit(bc, p.first + "_0")) {
set_ec_cbit(config, ctx, bc, p.first, value.at(0), prefix); set_ec_cbit(config, ctx, bc, p.first, value.at(0), prefix);
} else { } else {
for (int i = 0; i < p.second; i++) { for (int i = 0; i < p.second; i++) {
@ -718,7 +728,7 @@ void write_asc(const Context *ctx, std::ostream &out)
{"PLLOUT_SELECT_A", 2}, {"PLLOUT_SELECT_A", 2},
{"PLLOUT_SELECT_B", 2}, {"PLLOUT_SELECT_B", 2},
{"PLLTYPE", 3}, {"PLLTYPE", 3},
{"SHIFTREG_DIV_MODE", 1}, {"SHIFTREG_DIV_MODE", 2},
{"TEST_MODE", 1}}; {"TEST_MODE", 1}};
configure_extra_cell(config, ctx, cell.second.get(), pll_params, false, std::string("PLL.")); configure_extra_cell(config, ctx, cell.second.get(), pll_params, false, std::string("PLL."));