aboutsummaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorMiodrag Milanović <mmicko@gmail.com>2018-08-04 04:05:38 -0700
committerGitHub <noreply@github.com>2018-08-04 04:05:38 -0700
commitdc34d4c9ed11e034bf9f81c02365496658f36517 (patch)
tree4cfb053ffccefe134d1ef84ecb5bce972fa0d167 /generic
parentf5a1b93f0e9348437ece7fb7d46ac69af98536d0 (diff)
parent0cb349b60ea17378a4c163f0c8b12e8b17988cee (diff)
downloadnextpnr-dc34d4c9ed11e034bf9f81c02365496658f36517.tar.gz
nextpnr-dc34d4c9ed11e034bf9f81c02365496658f36517.tar.bz2
nextpnr-dc34d4c9ed11e034bf9f81c02365496658f36517.zip
Merge pull request #33 from YosysHQ/gui-ecp5
Gui ecp5
Diffstat (limited to 'generic')
-rw-r--r--generic/arch.cc2
-rw-r--r--generic/main.cc5
2 files changed, 4 insertions, 3 deletions
diff --git a/generic/arch.cc b/generic/arch.cc
index f9133f9e..7c0828e0 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) {}
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();