diff options
| author | gatecat <gatecat@ds0.me> | 2021-06-04 19:25:34 +0100 |
|---|---|---|
| committer | gatecat <gatecat@ds0.me> | 2021-06-04 19:25:34 +0100 |
| commit | 6fbc9e8159cf036e2e4700a04409e32630ed5f34 (patch) | |
| tree | 61fd6f7e36e6bc3bf67c0a04a4bf263af4699a94 /mistral | |
| parent | 47f24a702464e5afbf04e72ea4acd79615b0b0ef (diff) | |
| download | nextpnr-6fbc9e8159cf036e2e4700a04409e32630ed5f34.tar.gz nextpnr-6fbc9e8159cf036e2e4700a04409e32630ed5f34.tar.bz2 nextpnr-6fbc9e8159cf036e2e4700a04409e32630ed5f34.zip | |
mistral: Remove mistral root argument
Signed-off-by: gatecat <gatecat@ds0.me>
Diffstat (limited to 'mistral')
| -rw-r--r-- | mistral/arch.cc | 2 | ||||
| -rw-r--r-- | mistral/arch.h | 1 | ||||
| -rw-r--r-- | mistral/main.cc | 5 |
3 files changed, 1 insertions, 7 deletions
diff --git a/mistral/arch.cc b/mistral/arch.cc index 70e8f806..ba7483e7 100644 --- a/mistral/arch.cc +++ b/mistral/arch.cc @@ -46,7 +46,7 @@ void IdString::initialize_arch(const BaseCtx *ctx) Arch::Arch(ArchArgs args) { this->args = args; - this->cyclonev = mistral::CycloneV::get_model(args.device, args.mistral_root); + this->cyclonev = mistral::CycloneV::get_model(args.device); NPNR_ASSERT(this->cyclonev != nullptr); // Setup fast identifier maps diff --git a/mistral/arch.h b/mistral/arch.h index 1a42530a..c00ee2a7 100644 --- a/mistral/arch.h +++ b/mistral/arch.h @@ -34,7 +34,6 @@ NEXTPNR_NAMESPACE_BEGIN struct ArchArgs { std::string device; - std::string mistral_root; }; // These structures are used for fast ALM validity checking diff --git a/mistral/main.cc b/mistral/main.cc index 0afba3d8..bd9ef591 100644 --- a/mistral/main.cc +++ b/mistral/main.cc @@ -47,7 +47,6 @@ MistralCommandHandler::MistralCommandHandler(int argc, char **argv) : CommandHan po::options_description MistralCommandHandler::getArchOptions() { po::options_description specific("Architecture specific options"); - specific.add_options()("mistral", po::value<std::string>(), "path to mistral root"); specific.add_options()("device", po::value<std::string>(), "device name (e.g. 5CSEBA6U23I7)"); specific.add_options()("qsf", po::value<std::string>(), "path to QSF constraints file"); specific.add_options()("rbf", po::value<std::string>(), "RBF bitstream to write"); @@ -74,13 +73,9 @@ void MistralCommandHandler::customBitstream(Context *ctx) std::unique_ptr<Context> MistralCommandHandler::createContext(dict<std::string, Property> &values) { ArchArgs chipArgs; - if (!vm.count("mistral")) { - log_error("mistral must be specified on the command line\n"); - } if (!vm.count("device")) { log_error("device must be specified on the command line (e.g. --device 5CSEBA6U23I7)\n"); } - chipArgs.mistral_root = vm["mistral"].as<std::string>(); chipArgs.device = vm["device"].as<std::string>(); auto ctx = std::unique_ptr<Context>(new Context(chipArgs)); if (vm.count("compress-rbf")) |