Merge branch 'master' of github.com:YosysHQ/nextpnr into lutperm

2 files changed, 5 insertions, 4 deletions

diff --git a/generic/arch.cc b/generic/arch.cc
index f9133f9e..a0ab58f8 100644
--- a/generic/arch.cc
+++ b/generic/arch.cc
@@ -175,7 +175,7 @@ void Arch::setGroupDecal(GroupId group, DecalXY decalxy)
 
 // ---------------------------------------------------------------
 
-Arch::Arch(ArchArgs) {}
+Arch::Arch(ArchArgs) : chipName("generic") {}
 
 void IdString::initialize_arch(const BaseCtx *ctx) {}
 
@@ -412,7 +412,7 @@ delay_t Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, de
 
 // ---------------------------------------------------------------
 
-bool Arch::place() { return placer1(getCtx()\, Placer1Cfg()); }
+bool Arch::place() { return placer1(getCtx(), Placer1Cfg()); }
 
 bool Arch::route() { return router1(getCtx(), Router1Cfg()); }
 
diff --git a/generic/main.cc b/generic/main.cc
index 3b8b3fe6..8653da01 100644
--- a/generic/main.cc
+++ b/generic/main.cc
@@ -90,7 +90,8 @@ int main(int argc, char *argv[])
             return 1;
         }
 
-        std::unique_ptr<Context> ctx = std::unique_ptr<Context>(new Context(ArchArgs{}));
+        ArchArgs chipArgs{};
+        std::unique_ptr<Context> ctx = std::unique_ptr<Context>(new Context(chipArgs));
 
         if (vm.count("verbose")) {
             ctx->verbose = true;
@@ -107,7 +108,7 @@ int main(int argc, char *argv[])
 #ifndef NO_GUI
         if (vm.count("gui")) {
             Application a(argc, argv);
-            MainWindow w(std::move(ctx));
+            MainWindow w(std::move(ctx), chipArgs);
             w.show();
 
             return a.exec();