Rename "dummy" arch to "generic"

Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-06-29 20:40:55 +02:00
parent c73759f9f1
commit b908b02022
13 changed files with 7 additions and 7 deletions

2
.gitignore vendored
View File

@ -1,6 +1,6 @@
/generated/ /generated/
/objs/ /objs/
/nextpnr-dummy* /nextpnr-generic*
/nextpnr-ice40* /nextpnr-ice40*
cmake-build-*/ cmake-build-*/
Makefile Makefile

View File

@ -7,7 +7,7 @@ option(BUILD_PYTHON "Build Python Integration" ON)
option(BUILD_TESTS "Build GUI" OFF) option(BUILD_TESTS "Build GUI" OFF)
# List of families to build # List of families to build
set(FAMILIES dummy ice40) set(FAMILIES generic ice40)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_FLAGS_DEBUG "-Wall -fPIC -ggdb") set(CMAKE_CXX_FLAGS_DEBUG "-Wall -fPIC -ggdb")
set(CMAKE_CXX_FLAGS_RELEASE "-Wall -fPIC -O3 -g") set(CMAKE_CXX_FLAGS_RELEASE "-Wall -fPIC -O3 -g")

View File

@ -24,7 +24,7 @@ NEXTPNR_NAMESPACE_BEGIN
Arch::Arch(ArchArgs) {} Arch::Arch(ArchArgs) {}
std::string Arch::getChipName() { return "Dummy"; } std::string Arch::getChipName() { return "Generic"; }
void IdString::initialize_arch(const BaseCtx *ctx) {} void IdString::initialize_arch(const BaseCtx *ctx) {}

View File

@ -36,7 +36,7 @@ struct Arch : BaseCtx
virtual IdString id(const std::string &s) const { abort(); } virtual IdString id(const std::string &s) const { abort(); }
virtual IdString id(const char *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 archArgsToId(ArchArgs args) const { return id("none"); }
IdString belTypeToId(BelType type) const { return type; } IdString belTypeToId(BelType type) const { return type; }

View File

@ -27,7 +27,7 @@ MainWindow::MainWindow(QWidget *parent) : BaseMainWindow(parent)
{ {
initMainResource(); initMainResource();
std::string title = "nextpnr-dummy - [EMPTY]"; std::string title = "nextpnr-generic - [EMPTY]";
setWindowTitle(title.c_str()); setWindowTitle(title.c_str());
createMenu(); createMenu();
@ -37,7 +37,7 @@ MainWindow::~MainWindow() {}
void MainWindow::createMenu() void MainWindow::createMenu()
{ {
QMenu *menu_Custom = new QMenu("&Dummy", menuBar); QMenu *menu_Custom = new QMenu("&Generic", menuBar);
menuBar->addAction(menu_Custom->menuAction()); menuBar->addAction(menu_Custom->menuAction());
} }