diff options
| -rw-r--r-- | nexus/arch_place.cc | 3 | ||||
| -rw-r--r-- | nexus/pack.cc | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/nexus/arch_place.cc b/nexus/arch_place.cc index 518f122e..7e50de29 100644 --- a/nexus/arch_place.cc +++ b/nexus/arch_place.cc @@ -25,9 +25,6 @@ NEXTPNR_NAMESPACE_BEGIN bool Arch::nexus_logic_tile_valid(LogicTileStatus <s) const { -#if 1 - return true; -#endif for (int s = 0; s < 4; s++) { if (lts.slices[s].dirty) { lts.slices[s].valid = false; diff --git a/nexus/pack.cc b/nexus/pack.cc index bd237117..eb740858 100644 --- a/nexus/pack.cc +++ b/nexus/pack.cc @@ -236,10 +236,10 @@ struct NexusPacker ff_rules[type].port_xform[id_SP] = id_CE; ff_rules[type].port_xform[id_Q] = id_Q; - ff_rules[id_FD1P3BX].default_params.emplace_back(id_CLKMUX, std::string("CLK")); - ff_rules[id_FD1P3BX].default_params.emplace_back(id_CEMUX, std::string("CE")); - ff_rules[id_FD1P3BX].default_params.emplace_back(id_LSRMUX, std::string("LSR")); - ff_rules[id_FD1P3BX].set_params.emplace_back(id_LSRMODE, std::string("LSR")); + ff_rules[type].default_params.emplace_back(id_CLKMUX, std::string("CLK")); + ff_rules[type].default_params.emplace_back(id_CEMUX, std::string("CE")); + ff_rules[type].default_params.emplace_back(id_LSRMUX, std::string("LSR")); + ff_rules[type].set_params.emplace_back(id_LSRMODE, std::string("LSR")); } // Async preload ff_rules[id_FD1P3BX].set_params.emplace_back(id_SRMODE, std::string("ASYNC")); @@ -275,6 +275,7 @@ bool Arch::pack() (NexusPacker(getCtx()))(); attrs[id("step")] = std::string("pack"); archInfoToAttributes(); + assignArchInfo(); return true; } |