diff options
-rw-r--r-- | gui/ice40/mainwindow.cc | 24 | ||||
-rw-r--r-- | ice40/arch.cc | 60 | ||||
-rw-r--r-- | ice40/arch.h | 5 | ||||
-rw-r--r-- | ice40/main.cc | 55 |
4 files changed, 121 insertions, 23 deletions
diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc index 3dcf90ae..3c9cab1f 100644 --- a/gui/ice40/mainwindow.cc +++ b/gui/ice40/mainwindow.cc @@ -78,19 +78,29 @@ void MainWindow::new_proj() {
QMap<QString, int> arch;
if (Arch::isAvailable(ArchArgs::LP384))
- arch.insert("Lattice LP384", ArchArgs::LP384);
+ arch.insert("Lattice iCE40LP384", ArchArgs::LP384);
if (Arch::isAvailable(ArchArgs::LP1K))
- arch.insert("Lattice LP1K", ArchArgs::LP1K);
+ arch.insert("Lattice iCE40LP1K", ArchArgs::LP1K);
if (Arch::isAvailable(ArchArgs::HX1K))
- arch.insert("Lattice HX1K", ArchArgs::HX1K);
+ arch.insert("Lattice iCE40HX1K", ArchArgs::HX1K);
+ if (Arch::isAvailable(ArchArgs::U1K))
+ arch.insert("Lattice iCE5LP1K", ArchArgs::U1K);
+ if (Arch::isAvailable(ArchArgs::U2K))
+ arch.insert("Lattice iCE5LP2K", ArchArgs::U2K);
if (Arch::isAvailable(ArchArgs::U4K))
- arch.insert("Lattice U4K", ArchArgs::U4K);
+ arch.insert("Lattice iCE5LP4K", ArchArgs::U4K);
+ if (Arch::isAvailable(ArchArgs::UP3K))
+ arch.insert("Lattice iCE40UP3K", ArchArgs::UP3K);
if (Arch::isAvailable(ArchArgs::UP5K))
- arch.insert("Lattice UP5K", ArchArgs::UP5K);
+ arch.insert("Lattice iCE40UP5K", ArchArgs::UP5K);
+ if (Arch::isAvailable(ArchArgs::LP4K))
+ arch.insert("Lattice iCE40LP4K", ArchArgs::LP4K);
if (Arch::isAvailable(ArchArgs::LP8K))
- arch.insert("Lattice LP8K", ArchArgs::LP8K);
+ arch.insert("Lattice iCE40LP8K", ArchArgs::LP8K);
+ if (Arch::isAvailable(ArchArgs::HX4K))
+ arch.insert("Lattice iCE40HX4K", ArchArgs::HX4K);
if (Arch::isAvailable(ArchArgs::HX8K))
- arch.insert("Lattice HX8K", ArchArgs::HX8K);
+ arch.insert("Lattice iCE40HX8K", ArchArgs::HX8K);
bool ok;
QString item = QInputDialog::getItem(this, "Select new context", "Chip:", arch.keys(), 0, false, &ok);
diff --git a/ice40/arch.cc b/ice40/arch.cc index be346fd7..74674799 100644 --- a/ice40/arch.cc +++ b/ice40/arch.cc @@ -51,11 +51,11 @@ static const ChipInfoPOD *get_chip_info(ArchArgs::ArchArgsTypes chip) chipdb = "ice40/chipdb-384.bin"; } else if (chip == ArchArgs::LP1K || chip == ArchArgs::HX1K) { chipdb = "ice40/chipdb-1k.bin"; - } else if (chip == ArchArgs::U4K) { + } else if (chip == ArchArgs::U1K || chip == ArchArgs::U2K || chip == ArchArgs::U4K) { chipdb = "ice40/chipdb-u4k.bin"; - } else if (chip == ArchArgs::UP5K) { + } else if (chip == ArchArgs::UP3K || chip == ArchArgs::UP5K) { chipdb = "ice40/chipdb-5k.bin"; - } else if (chip == ArchArgs::LP8K || chip == ArchArgs::HX8K) { + } else if (chip == ArchArgs::LP8K || chip == ArchArgs::HX8K || chip == ArchArgs::LP4K || chip == ArchArgs::HX4K) { chipdb = "ice40/chipdb-8k.bin"; } else { log_error("Unknown chip\n"); @@ -73,8 +73,16 @@ std::vector<std::string> Arch::getSupportedPackages(ArchArgs::ArchArgsTypes chip { const ChipInfoPOD *chip_info = get_chip_info(chip); std::vector<std::string> packages; - for (int i = 0; i < chip_info->num_packages; i++) - packages.push_back(chip_info->packages_data[i].name.get()); + for (int i = 0; i < chip_info->num_packages; i++) { + std::string name = chip_info->packages_data[i].name.get(); + if (chip == ArchArgs::LP4K || chip == ArchArgs::HX4K) { + if (name.find(":4k") != std::string::npos) + name = name.substr(0, name.size() - 3); + else + continue; + } + packages.push_back(name); + } return packages; } @@ -82,15 +90,19 @@ std::vector<std::string> Arch::getSupportedPackages(ArchArgs::ArchArgsTypes chip Arch::Arch(ArchArgs args) : args(args) { - fast_part = (args.type == ArchArgs::HX8K || args.type == ArchArgs::HX1K); + fast_part = (args.type == ArchArgs::HX8K || args.type == ArchArgs::HX4K || args.type == ArchArgs::HX1K); chip_info = get_chip_info(args.type); if (chip_info == nullptr) log_error("Unsupported iCE40 chip type.\n"); package_info = nullptr; + std::string package_name = args.package; + if (args.type == ArchArgs::LP4K || args.type == ArchArgs::HX4K) + package_name += ":4k"; + for (int i = 0; i < chip_info->num_packages; i++) { - if (chip_info->packages_data[i].name.get() == args.package) { + if (chip_info->packages_data[i].name.get() == package_name) { package_info = &(chip_info->packages_data[i]); break; } @@ -110,19 +122,29 @@ Arch::Arch(ArchArgs args) : args(args) std::string Arch::getChipName() const { if (args.type == ArchArgs::LP384) { - return "Lattice LP384"; + return "Lattice iCE40LP384"; } else if (args.type == ArchArgs::LP1K) { - return "Lattice LP1K"; + return "Lattice iCE40LP1K"; } else if (args.type == ArchArgs::HX1K) { - return "Lattice HX1K"; + return "Lattice iCE40HX1K"; + } else if (args.type == ArchArgs::UP3K) { + return "Lattice iCE40UP3K"; } else if (args.type == ArchArgs::UP5K) { - return "Lattice UP5K"; + return "Lattice iCE40UP5K"; + } else if (args.type == ArchArgs::U1K) { + return "Lattice iCE5LP1K"; + } else if (args.type == ArchArgs::U2K) { + return "Lattice iCE5LP2K"; } else if (args.type == ArchArgs::U4K) { - return "Lattice U4K"; + return "Lattice iCE5LP4K"; + } else if (args.type == ArchArgs::LP4K) { + return "Lattice iCE40LP4K"; } else if (args.type == ArchArgs::LP8K) { - return "Lattice LP8K"; + return "Lattice iCE40LP8K"; + } else if (args.type == ArchArgs::HX4K) { + return "Lattice iCE40HX4K"; } else if (args.type == ArchArgs::HX8K) { - return "Lattice HX8K"; + return "Lattice iCE40HX8K"; } else { log_error("Unknown chip\n"); } @@ -138,12 +160,22 @@ IdString Arch::archArgsToId(ArchArgs args) const return id("lp1k"); if (args.type == ArchArgs::HX1K) return id("hx1k"); + if (args.type == ArchArgs::UP3K) + return id("up3k"); if (args.type == ArchArgs::UP5K) return id("up5k"); + if (args.type == ArchArgs::U1K) + return id("u1k"); + if (args.type == ArchArgs::U2K) + return id("u2k"); if (args.type == ArchArgs::U4K) return id("u4k"); + if (args.type == ArchArgs::LP4K) + return id("lp4k"); if (args.type == ArchArgs::LP8K) return id("lp8k"); + if (args.type == ArchArgs::HX4K) + return id("hx4k"); if (args.type == ArchArgs::HX8K) return id("hx8k"); return IdString(); diff --git a/ice40/arch.h b/ice40/arch.h index 0d8e7d76..0af0a5dd 100644 --- a/ice40/arch.h +++ b/ice40/arch.h @@ -385,10 +385,15 @@ struct ArchArgs NONE, LP384, LP1K, + LP4K, LP8K, HX1K, + HX4K, HX8K, + UP3K, UP5K, + U1K, + U2K, U4K } type = NONE; std::string package; diff --git a/ice40/main.cc b/ice40/main.cc index 497d580b..cabf6a2e 100644 --- a/ice40/main.cc +++ b/ice40/main.cc @@ -54,14 +54,24 @@ po::options_description Ice40CommandHandler::getArchOptions() specific.add_options()("lp384", "set device type to iCE40LP384"); if (Arch::isAvailable(ArchArgs::LP1K)) specific.add_options()("lp1k", "set device type to iCE40LP1K"); + if (Arch::isAvailable(ArchArgs::LP4K)) + specific.add_options()("lp4k", "set device type to iCE40LP4K"); if (Arch::isAvailable(ArchArgs::LP8K)) specific.add_options()("lp8k", "set device type to iCE40LP8K"); if (Arch::isAvailable(ArchArgs::HX1K)) specific.add_options()("hx1k", "set device type to iCE40HX1K"); if (Arch::isAvailable(ArchArgs::HX8K)) + specific.add_options()("hx4k", "set device type to iCE40HX4K"); + if (Arch::isAvailable(ArchArgs::HX4K)) specific.add_options()("hx8k", "set device type to iCE40HX8K"); + if (Arch::isAvailable(ArchArgs::UP3K)) + specific.add_options()("up3k", "set device type to iCE40UP3K"); if (Arch::isAvailable(ArchArgs::UP5K)) specific.add_options()("up5k", "set device type to iCE40UP5K"); + if (Arch::isAvailable(ArchArgs::U1K)) + specific.add_options()("u1k", "set device type to iCE5LP1K"); + if (Arch::isAvailable(ArchArgs::U2K)) + specific.add_options()("u2k", "set device type to iCE5LP2K"); if (Arch::isAvailable(ArchArgs::U4K)) specific.add_options()("u4k", "set device type to iCE5LP4K"); specific.add_options()("package", po::value<std::string>(), "set device package"); @@ -80,8 +90,9 @@ po::options_description Ice40CommandHandler::getArchOptions() void Ice40CommandHandler::validate() { conflicting_options(vm, "read", "json"); - if ((vm.count("lp384") + vm.count("lp1k") + vm.count("lp8k") + vm.count("hx1k") + vm.count("hx8k") + - vm.count("up5k") + vm.count("u4k")) > 1) + if ((vm.count("lp384") + vm.count("lp1k") + vm.count("lp4k") + vm.count("lp8k") + vm.count("hx1k") + + vm.count("hx4k") + vm.count("hx8k") + vm.count("up3k") + vm.count("up5k") + vm.count("u1k") + vm.count("u2k") + + vm.count("u4k")) > 1) log_error("Only one device type can be set\n"); } @@ -132,6 +143,11 @@ std::unique_ptr<Context> Ice40CommandHandler::createContext(std::unordered_map<s chipArgs.package = "tq144"; } + if (vm.count("lp4k")) { + chipArgs.type = ArchArgs::LP4K; + chipArgs.package = "tq144"; + } + if (vm.count("lp8k")) { chipArgs.type = ArchArgs::LP8K; chipArgs.package = "ct256"; @@ -142,16 +158,36 @@ std::unique_ptr<Context> Ice40CommandHandler::createContext(std::unordered_map<s chipArgs.package = "tq144"; } + if (vm.count("hx4k")) { + chipArgs.type = ArchArgs::HX4K; + chipArgs.package = "tq144"; + } + if (vm.count("hx8k")) { chipArgs.type = ArchArgs::HX8K; chipArgs.package = "ct256"; } + if (vm.count("up3k")) { + chipArgs.type = ArchArgs::UP3K; + chipArgs.package = "sg48"; + } + if (vm.count("up5k")) { chipArgs.type = ArchArgs::UP5K; chipArgs.package = "sg48"; } + if (vm.count("u1k")) { + chipArgs.type = ArchArgs::U1K; + chipArgs.package = "sg48"; + } + + if (vm.count("u2k")) { + chipArgs.type = ArchArgs::U2K; + chipArgs.package = "sg48"; + } + if (vm.count("u4k")) { chipArgs.type = ArchArgs::U4K; chipArgs.package = "sg48"; @@ -179,18 +215,33 @@ std::unique_ptr<Context> Ice40CommandHandler::createContext(std::unordered_map<s if (arch_type == "lp1k") { chipArgs.type = ArchArgs::LP1K; } + if (arch_type == "lp4k") { + chipArgs.type = ArchArgs::LP4K; + } if (arch_type == "lp8k") { chipArgs.type = ArchArgs::LP8K; } if (arch_type == "hx1k") { chipArgs.type = ArchArgs::HX1K; } + if (arch_type == "hx4k") { + chipArgs.type = ArchArgs::HX4K; + } if (arch_type == "hx8k") { chipArgs.type = ArchArgs::HX8K; } + if (arch_type == "up3k") { + chipArgs.type = ArchArgs::UP3K; + } if (arch_type == "up5k") { chipArgs.type = ArchArgs::UP5K; } + if (arch_type == "u1k") { + chipArgs.type = ArchArgs::U1K; + } + if (arch_type == "u2k") { + chipArgs.type = ArchArgs::U2K; + } if (arch_type == "u4k") { chipArgs.type = ArchArgs::U4K; } |