aboutsummaryrefslogtreecommitdiffstats
path: root/ecp5/main.cc
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2018-08-02 13:02:07 +0200
committerClifford Wolf <clifford@clifford.at>2018-08-02 13:02:07 +0200
commitf9a9da6cdb6e864f04532fd1d1ab3e646319fc2d (patch)
treed0542fcdf558552f23b8baa49f4f981bf23d1883 /ecp5/main.cc
parent2b3f363e8975e80bb56e6adaea5604ab8fce164c (diff)
parent81ee55c7eb2f153ba01a6ff8aba2bffc54daa9dc (diff)
downloadnextpnr-f9a9da6cdb6e864f04532fd1d1ab3e646319fc2d.tar.gz
nextpnr-f9a9da6cdb6e864f04532fd1d1ab3e646319fc2d.tar.bz2
nextpnr-f9a9da6cdb6e864f04532fd1d1ab3e646319fc2d.zip
Merge branch 'master' of github.com:YosysHQ/nextpnr into reroute
Diffstat (limited to 'ecp5/main.cc')
-rw-r--r--ecp5/main.cc13
1 files changed, 1 insertions, 12 deletions
diff --git a/ecp5/main.cc b/ecp5/main.cc
index 68660ced..f40a5e61 100644
--- a/ecp5/main.cc
+++ b/ecp5/main.cc
@@ -32,10 +32,6 @@
#include <fstream>
#include <iostream>
-#include "Chip.hpp"
-#include "Database.hpp"
-#include "Tile.hpp"
-
#include "log.h"
#include "nextpnr.h"
#include "version.h"
@@ -75,7 +71,6 @@ int main(int argc, char *argv[])
options.add_options()("seed", po::value<int>(), "seed value for random number generator");
options.add_options()("basecfg", po::value<std::string>(), "base chip configuration in Trellis text format");
- options.add_options()("bit", po::value<std::string>(), "bitstream file to write");
options.add_options()("textcfg", po::value<std::string>(), "textual configuration in Trellis format to write");
po::positional_options_description pos;
@@ -115,8 +110,6 @@ int main(int argc, char *argv[])
return 1;
}
- Trellis::load_database(TRELLIS_ROOT "/database");
-
ArchArgs args;
args.type = ArchArgs::LFE5U_45F;
@@ -189,14 +182,10 @@ int main(int argc, char *argv[])
if (vm.count("basecfg"))
basecfg = vm["basecfg"].as<std::string>();
- std::string bitstream;
- if (vm.count("bit"))
- bitstream = vm["bit"].as<std::string>();
-
std::string textcfg;
if (vm.count("textcfg"))
textcfg = vm["textcfg"].as<std::string>();
- write_bitstream(ctx.get(), basecfg, textcfg, bitstream);
+ write_bitstream(ctx.get(), basecfg, textcfg);
}
#ifndef NO_PYTHON