From 82ed1803c726e912730c3053179f179b90c9b694 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sun, 2 Jun 2019 18:38:20 +0200
Subject: [PATCH] use NEXTPNR_BEL, since BEL is initial placement

---
 common/command.cc | 2 +-
 json/jsonwrite.cc | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/common/command.cc b/common/command.cc
index 7d4cd252..d0ef5174 100644
--- a/common/command.cc
+++ b/common/command.cc
@@ -350,7 +350,7 @@ int CommandHandler::executeMain(std::unique_ptr<Context> ctx)
         } else {
             for (auto &pair : ctx->cells) {       
                 auto &c = pair.second;
-                auto bel = c->attrs.find(ctx->id("BEL"));
+                auto bel = c->attrs.find(ctx->id("NEXTPNR_BEL"));
                 if (bel!=c->attrs.end())
                 {
                     BelId b = ctx->getBelByName(ctx->id(bel->second.c_str()));
diff --git a/json/jsonwrite.cc b/json/jsonwrite.cc
index 7143bf93..e62a7d2a 100644
--- a/json/jsonwrite.cc
+++ b/json/jsonwrite.cc
@@ -102,6 +102,11 @@ void write_constraints(std::ostream &f, Context *ctx, CellInfo *cell, bool first
     f << stringf(",\n");
     f << stringf("            \"NEXTPNR_CONSTR_CHILDREN\": ");
     f << get_string(constr);
+    if (cell->bel != BelId()) {
+        f << stringf(",\n");
+        f << stringf("            \"NEXTPNR_BEL\": ");
+        f << get_string(ctx->getBelName(cell->bel).c_str(ctx));
+    }
 
 }