diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-07-10 15:11:35 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-07-10 15:11:35 +0200 |
| commit | 87d88048ac14de3fd70aca7e75f7b42ff424ece0 (patch) | |
| tree | ee6abd2dccd279aeb3ead44c697f2f033bec731b /gui | |
| parent | 841714a3d6bf475586812db3ba39bbd4dd4606de (diff) | |
| parent | bfc47e9cd4512a503266c3f9cbe8841ed6136580 (diff) | |
| download | nextpnr-87d88048ac14de3fd70aca7e75f7b42ff424ece0.tar.gz nextpnr-87d88048ac14de3fd70aca7e75f7b42ff424ece0.tar.bz2 nextpnr-87d88048ac14de3fd70aca7e75f7b42ff424ece0.zip | |
Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr into ice40gfx
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gui/generic/family.cmake | 0 | ||||
| -rw-r--r-- | gui/ice40/family.cmake | 3 | ||||
| -rw-r--r-- | gui/ice40/mainwindow.cc | 4 |
4 files changed, 8 insertions, 0 deletions
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 68fd0229..5ac4d955 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -26,6 +26,7 @@ qt5_add_resources(GUI_RESOURCE_FILES ${_RESOURCES}) set(GUI_LIBRARY_FILES_${ufamily} Qt5::Widgets Qt5::OpenGL ${OPENGL_LIBRARIES} QtPropertyBrowser PARENT_SCOPE) add_library(gui_${family} STATIC ${GUI_SOURCE_FILES} ${PYTHON_CONSOLE_SRC} ${GUI_RESOURCE_FILES}) +include(${family}/family.cmake) target_include_directories(gui_${family} PRIVATE ../${family} ${family} ../3rdparty/QtPropertyBrowser/src) if (BUILD_PYTHON) diff --git a/gui/generic/family.cmake b/gui/generic/family.cmake new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/gui/generic/family.cmake diff --git a/gui/ice40/family.cmake b/gui/ice40/family.cmake new file mode 100644 index 00000000..ede5b805 --- /dev/null +++ b/gui/ice40/family.cmake @@ -0,0 +1,3 @@ +if(ICE40_HX1K_ONLY) + target_compile_definitions(gui_${family} PRIVATE ICE40_HX1K_ONLY=1) +endif() diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc index f423ee37..c4e568a3 100644 --- a/gui/ice40/mainwindow.cc +++ b/gui/ice40/mainwindow.cc @@ -220,12 +220,16 @@ QStringList getSupportedPackages(ArchArgs::ArchArgsTypes chip) void MainWindow::new_proj()
{
QMap<QString, int> arch;
+#ifdef ICE40_HX1K_ONLY
+ arch.insert("Lattice HX1K", ArchArgs::HX1K);
+#else
arch.insert("Lattice LP384", ArchArgs::LP384);
arch.insert("Lattice LP1K", ArchArgs::LP1K);
arch.insert("Lattice HX1K", ArchArgs::HX1K);
arch.insert("Lattice UP5K", ArchArgs::UP5K);
arch.insert("Lattice LP8K", ArchArgs::LP8K);
arch.insert("Lattice HX8K", ArchArgs::HX8K);
+#endif
bool ok;
QString item = QInputDialog::getItem(this, "Select new context", "Chip:", arch.keys(), 0, false, &ok);
if (ok && !item.isEmpty()) {
|