diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | generic/arch.cc (renamed from dummy/arch.cc) | 2 | ||||
| -rw-r--r-- | generic/arch.h (renamed from dummy/arch.h) | 2 | ||||
| -rw-r--r-- | generic/archdefs.h (renamed from dummy/archdefs.h) | 0 | ||||
| -rw-r--r-- | generic/family.cmake (renamed from dummy/family.cmake) | 0 | ||||
| -rw-r--r-- | generic/main.cc (renamed from dummy/main.cc) | 0 | ||||
| -rw-r--r-- | generic/place_legaliser.cc (renamed from dummy/place_legaliser.cc) | 0 | ||||
| -rw-r--r-- | generic/place_legaliser.h (renamed from dummy/place_legaliser.h) | 0 | ||||
| -rw-r--r-- | generic/pybindings.cc (renamed from dummy/pybindings.cc) | 0 | ||||
| -rw-r--r-- | gui/generic/mainwindow.cc (renamed from gui/dummy/mainwindow.cc) | 4 | ||||
| -rw-r--r-- | gui/generic/mainwindow.h (renamed from gui/dummy/mainwindow.h) | 0 | ||||
| -rw-r--r-- | gui/generic/nextpnr.qrc (renamed from gui/dummy/nextpnr.qrc) | 0 |
13 files changed, 7 insertions, 7 deletions
@@ -1,6 +1,6 @@ /generated/ /objs/ -/nextpnr-dummy* +/nextpnr-generic* /nextpnr-ice40* cmake-build-*/ Makefile diff --git a/CMakeLists.txt b/CMakeLists.txt index 428b137a..ad21b04d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ option(BUILD_PYTHON "Build Python Integration" ON) option(BUILD_TESTS "Build GUI" OFF) # List of families to build -set(FAMILIES dummy ice40) +set(FAMILIES generic ice40) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_FLAGS_DEBUG "-Wall -fPIC -ggdb") set(CMAKE_CXX_FLAGS_RELEASE "-Wall -fPIC -O3 -g") @@ -194,4 +194,4 @@ unset(SANITIZE_ADDRESS CACHE) unset(SANITIZE_MEMORY CACHE) unset(SANITIZE_THREAD CACHE) unset(SANITIZE_UNDEFINED CACHE) -unset(SANITIZE_LINK_STATIC CACHE)
\ No newline at end of file +unset(SANITIZE_LINK_STATIC CACHE) diff --git a/dummy/arch.cc b/generic/arch.cc index 9d29921c..9bdda5ba 100644 --- a/dummy/arch.cc +++ b/generic/arch.cc @@ -24,7 +24,7 @@ NEXTPNR_NAMESPACE_BEGIN Arch::Arch(ArchArgs) {} -std::string Arch::getChipName() { return "Dummy"; } +std::string Arch::getChipName() { return "Generic"; } void IdString::initialize_arch(const BaseCtx *ctx) {} diff --git a/dummy/arch.h b/generic/arch.h index 59e143e6..ae68b974 100644 --- a/dummy/arch.h +++ b/generic/arch.h @@ -36,7 +36,7 @@ struct Arch : BaseCtx virtual IdString id(const std::string &s) const { abort(); } virtual IdString id(const char *s) const { abort(); } - IdString archId() const { return id("dummy"); } + IdString archId() const { return id("generic"); } IdString archArgsToId(ArchArgs args) const { return id("none"); } IdString belTypeToId(BelType type) const { return type; } diff --git a/dummy/archdefs.h b/generic/archdefs.h index 9e8462e0..9e8462e0 100644 --- a/dummy/archdefs.h +++ b/generic/archdefs.h diff --git a/dummy/family.cmake b/generic/family.cmake index e69de29b..e69de29b 100644 --- a/dummy/family.cmake +++ b/generic/family.cmake diff --git a/dummy/main.cc b/generic/main.cc index d025d8d4..d025d8d4 100644 --- a/dummy/main.cc +++ b/generic/main.cc diff --git a/dummy/place_legaliser.cc b/generic/place_legaliser.cc index 0d23f15b..0d23f15b 100644 --- a/dummy/place_legaliser.cc +++ b/generic/place_legaliser.cc diff --git a/dummy/place_legaliser.h b/generic/place_legaliser.h index 5f4df6aa..5f4df6aa 100644 --- a/dummy/place_legaliser.h +++ b/generic/place_legaliser.h diff --git a/dummy/pybindings.cc b/generic/pybindings.cc index a2997456..a2997456 100644 --- a/dummy/pybindings.cc +++ b/generic/pybindings.cc diff --git a/gui/dummy/mainwindow.cc b/gui/generic/mainwindow.cc index e86edafd..fef63094 100644 --- a/gui/dummy/mainwindow.cc +++ b/gui/generic/mainwindow.cc @@ -27,7 +27,7 @@ MainWindow::MainWindow(QWidget *parent) : BaseMainWindow(parent) {
initMainResource();
- std::string title = "nextpnr-dummy - [EMPTY]";
+ std::string title = "nextpnr-generic - [EMPTY]";
setWindowTitle(title.c_str());
createMenu();
@@ -37,7 +37,7 @@ MainWindow::~MainWindow() {} void MainWindow::createMenu()
{
- QMenu *menu_Custom = new QMenu("&Dummy", menuBar);
+ QMenu *menu_Custom = new QMenu("&Generic", menuBar);
menuBar->addAction(menu_Custom->menuAction());
}
diff --git a/gui/dummy/mainwindow.h b/gui/generic/mainwindow.h index fd9812cd..fd9812cd 100644 --- a/gui/dummy/mainwindow.h +++ b/gui/generic/mainwindow.h diff --git a/gui/dummy/nextpnr.qrc b/gui/generic/nextpnr.qrc index 03585ec0..03585ec0 100644 --- a/gui/dummy/nextpnr.qrc +++ b/gui/generic/nextpnr.qrc |