aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ecp5/arch.cc3
-rw-r--r--ecp5/arch.h2
-rw-r--r--generic/arch.h2
-rw-r--r--gui/ecp5/mainwindow.cc2
-rw-r--r--gui/generic/mainwindow.cc2
-rw-r--r--ice40/arch.cc2
-rw-r--r--ice40/arch.h2
7 files changed, 9 insertions, 6 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc
index 7f7079bf..2b40e79a 100644
--- a/ecp5/arch.cc
+++ b/ecp5/arch.cc
@@ -141,9 +141,8 @@ Arch::Arch(ArchArgs args) : args(args)
// -----------------------------------------------------------------------
-std::string Arch::getChipName()
+std::string Arch::getChipName() const
{
-
if (args.type == ArchArgs::LFE5U_25F) {
return "LFE5U-25F";
} else if (args.type == ArchArgs::LFE5U_45F) {
diff --git a/ecp5/arch.h b/ecp5/arch.h
index 7d183e11..2421428f 100644
--- a/ecp5/arch.h
+++ b/ecp5/arch.h
@@ -399,7 +399,7 @@ struct Arch : BaseCtx
ArchArgs args;
Arch(ArchArgs args);
- std::string getChipName();
+ std::string getChipName() const;
IdString archId() const { return id("ecp5"); }
IdString archArgsToId(ArchArgs args) const;
diff --git a/generic/arch.h b/generic/arch.h
index ed069d4d..9a0da75b 100644
--- a/generic/arch.h
+++ b/generic/arch.h
@@ -122,7 +122,7 @@ struct Arch : BaseCtx
Arch(ArchArgs args);
- std::string getChipName() { return chipName; }
+ std::string getChipName() const { return chipName; }
IdString archId() const { return id("generic"); }
IdString archArgsToId(ArchArgs args) const { return id("none"); }
diff --git a/gui/ecp5/mainwindow.cc b/gui/ecp5/mainwindow.cc
index 1168a55c..4b1c7e3b 100644
--- a/gui/ecp5/mainwindow.cc
+++ b/gui/ecp5/mainwindow.cc
@@ -40,6 +40,8 @@ void MainWindow::createMenu()
{
QMenu *menu_Custom = new QMenu("&Generic", menuBar);
menuBar->addAction(menu_Custom->menuAction());
+
+ createGraphicsBar();
}
void MainWindow::new_proj() {}
diff --git a/gui/generic/mainwindow.cc b/gui/generic/mainwindow.cc
index 88e291e6..1efc73bb 100644
--- a/gui/generic/mainwindow.cc
+++ b/gui/generic/mainwindow.cc
@@ -40,6 +40,8 @@ void MainWindow::createMenu()
{
QMenu *menu_Custom = new QMenu("&Generic", menuBar);
menuBar->addAction(menu_Custom->menuAction());
+
+ createGraphicsBar();
}
void MainWindow::new_proj() {}
diff --git a/ice40/arch.cc b/ice40/arch.cc
index fd68e972..f3004155 100644
--- a/ice40/arch.cc
+++ b/ice40/arch.cc
@@ -204,7 +204,7 @@ Arch::Arch(ArchArgs args) : args(args)
// -----------------------------------------------------------------------
-std::string Arch::getChipName()
+std::string Arch::getChipName() const
{
#ifdef ICE40_HX1K_ONLY
if (args.type == ArchArgs::HX1K) {
diff --git a/ice40/arch.h b/ice40/arch.h
index 1d68ec4a..7efa733c 100644
--- a/ice40/arch.h
+++ b/ice40/arch.h
@@ -365,7 +365,7 @@ struct Arch : BaseCtx
ArchArgs args;
Arch(ArchArgs args);
- std::string getChipName();
+ std::string getChipName() const;
IdString archId() const { return id("ice40"); }
IdString archArgsToId(ArchArgs args) const;