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

ecp5: EXTREFB fixes

Browse Source 
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2018-11-09 18:18:50 +00:00
parent bc022173f0
commit 0eba7d9789
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ecp5/globals.cc
View File

@ -379,6 +379,8 @@ class Ecp5GlobalRouter
for (auto user : net->users) { for (auto user : net->users) {
if (user.port == id_CLKFB) { if (user.port == id_CLKFB) {
keep_users.push_back(user); keep_users.push_back(user);
} else if (net->driver.cell->type == id_EXTREFB && user.cell->type == id_DCCA) {
keep_users.push_back(user);
} else { } else {
glbnet->users.push_back(user); glbnet->users.push_back(user);
user.cell->ports.at(user.port).net = glbnet.get(); user.cell->ports.at(user.port).net = glbnet.get();

4
ecp5/pack.cc
View File

@ -1118,7 +1118,9 @@ class Ecp5Packer
if (refo == nullptr) if (refo == nullptr)
log_error("EXTREFB REFCLKO must not be unconnected\n"); log_error("EXTREFB REFCLKO must not be unconnected\n");
for (auto user : refo->users) { for (auto user : refo->users) {
if (user.cell->type != id_DCUA || (dcu != nullptr && dcu != user.cell)) if (user.cell->type != id_DCUA)
continue;
if (dcu != nullptr && dcu != user.cell)
log_error("EXTREFB REFCLKO must only drive a single DCUA\n"); log_error("EXTREFB REFCLKO must only drive a single DCUA\n");
dcu = user.cell; dcu = user.cell;
} }