From cd688a278435c8ea86aee365c02b3ba1af7d3a26 Mon Sep 17 00:00:00 2001 From: David Shah Date: Fri, 5 Oct 2018 16:47:03 +0100 Subject: ecp5: Fixing EBR constant tie-offs Signed-off-by: David Shah --- ecp5/bitstream.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ecp5/bitstream.cc') diff --git a/ecp5/bitstream.cc b/ecp5/bitstream.cc index b151d987..fb2a51cc 100644 --- a/ecp5/bitstream.cc +++ b/ecp5/bitstream.cc @@ -88,6 +88,7 @@ static void tie_cib_signal(Context *ctx, ChipConfig &cc, WireId wire, bool value NPNR_ASSERT(uphill.begin() != uphill.end()); // At least one uphill pip auto iter = uphill.begin(); cibsig = ctx->getPipSrcWire(*iter); + basename = ctx->getWireBasename(cibsig).str(ctx); ++iter; NPNR_ASSERT(!(iter != uphill.end())); // Exactly one uphill pip } @@ -454,7 +455,7 @@ void write_bitstream(Context *ctx, std::string base_config_file, std::string tex // Tie signals as appropriate for (auto port : ci->ports) { - if (port.second.net == nullptr) { + if (port.second.net == nullptr && port.second.type == PORT_IN) { if (port.first == id_CLKA || port.first == id_CLKB || port.first == id_WEA || port.first == id_WEB || port.first == id_CEA || port.first == id_CEB || port.first == id_OCEA || port.first == id_OCEB || port.first == id_RSTA || port.first == id_RSTB) -- cgit v1.2.3