aboutsummaryrefslogtreecommitdiffstats
path: root/ecp5
diff options
context:
space:
mode:
authorDavid Shah <dave@ds0.me>2019-02-24 13:47:03 +0000
committerDavid Shah <dave@ds0.me>2019-02-24 13:53:06 +0000
commit64dc453f122dd849e63b30aa5fe7e7b925f40b70 (patch)
tree345ebca41eecca08c163ae6a877d9c2220816a00 /ecp5
parent15314538f882c707a08c7223feeb2ae9307596bd (diff)
downloadnextpnr-64dc453f122dd849e63b30aa5fe7e7b925f40b70.tar.gz
nextpnr-64dc453f122dd849e63b30aa5fe7e7b925f40b70.tar.bz2
nextpnr-64dc453f122dd849e63b30aa5fe7e7b925f40b70.zip
ecp5: DELAYF/G fixes
Signed-off-by: David Shah <dave@ds0.me>
Diffstat (limited to 'ecp5')
-rw-r--r--ecp5/pack.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ecp5/pack.cc b/ecp5/pack.cc
index 8a991189..64682fd2 100644
--- a/ecp5/pack.cc
+++ b/ecp5/pack.cc
@@ -1802,7 +1802,7 @@ class Ecp5Packer
driven_by_iol = true;
if (driven_by_iol) {
disconnect_port(ctx, o_pio, id_I);
- i_pio->ports.at(id_I).net = nullptr;
+ o_pio->ports.at(id_I).net = nullptr;
disconnect_port(ctx, ci, id_A);
ci->ports.at(id_A).net = nullptr;
disconnect_port(ctx, ci, id_Z);
@@ -1825,7 +1825,7 @@ class Ecp5Packer
}
iol->params[ctx->id("DELAY.DEL_VALUE")] =
std::to_string(lookup_delay(str_or_default(ci->params, ctx->id("DEL_MODE"), "USER_DEFINED")));
- if (ci->params.count(ctx->id("DEL_VALUE")))
+ if (ci->params.count(ctx->id("DEL_VALUE")) && ci->params.at(ctx->id("DEL_VALUE")) != "DELAY0")
iol->params[ctx->id("DELAY.DEL_VALUE")] = ci->params.at(ctx->id("DEL_VALUE"));
if (ci->ports.count(id_LOADN))
replace_port(ci, id_LOADN, iol, id_LOADN);