From ec4a9685abf0fd7d7b2cfecc5dbfc09b963b6ea8 Mon Sep 17 00:00:00 2001 From: "William D. Jones" Date: Sat, 5 Dec 2020 00:38:00 -0500 Subject: machxo2: Initialize Arch context with device type and package. --- machxo2/main.cc | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'machxo2/main.cc') diff --git a/machxo2/main.cc b/machxo2/main.cc index 92a60d38..5a5c7f82 100644 --- a/machxo2/main.cc +++ b/machxo2/main.cc @@ -58,7 +58,7 @@ po::options_description MachXO2CommandHandler::getArchOptions() if (Arch::isAvailable(ArchArgs::LCMXO2_7000HC)) specific.add_options()("7000", "set device type to LCMXO2-7000HC"); - specific.add_options()("package", po::value(), "select device package (defaults to QFN32)"); + specific.add_options()("package", po::value(), "select device package"); specific.add_options()("speed", po::value(), "select device speedgrade (1 to 6 inclusive)"); specific.add_options()("override-basecfg", po::value(), @@ -76,6 +76,22 @@ void MachXO2CommandHandler::customBitstream(Context *ctx) {} std::unique_ptr MachXO2CommandHandler::createContext(std::unordered_map &values) { ArchArgs chipArgs; + chipArgs.type = ArchArgs::NONE; + if (vm.count("256")) + chipArgs.type = ArchArgs::LCMXO2_256HC; + if (vm.count("640")) + chipArgs.type = ArchArgs::LCMXO2_640HC; + if (vm.count("1200")) + chipArgs.type = ArchArgs::LCMXO2_1200HC; + if (vm.count("2000")) + chipArgs.type = ArchArgs::LCMXO2_2000HC; + if (vm.count("4000")) + chipArgs.type = ArchArgs::LCMXO2_4000HC; + if (vm.count("7000")) + chipArgs.type = ArchArgs::LCMXO2_7000HC; + if (vm.count("package")) + chipArgs.package = vm["package"].as(); + if (values.find("arch.name") != values.end()) { std::string arch_name = values["arch.name"].as_string(); if (arch_name != "machxo2") -- cgit v1.2.3