diff options
| author | Clifford Wolf <clifford@clifford.at> | 2017-11-21 18:19:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 18:19:47 +0100 |
| commit | 6e9a2da5c46edf00f1dc87c86053b5edbc17d5d7 (patch) | |
| tree | b94fdbf6f316b9758e8afd848d8c900343469f07 /icepack | |
| parent | 9a2a325acb846936431c4aa5843184034be25d5c (diff) | |
| parent | 9184fbdf404c0e94326919c92a27d3292994cdf1 (diff) | |
| download | icestorm-6e9a2da5c46edf00f1dc87c86053b5edbc17d5d7.tar.gz icestorm-6e9a2da5c46edf00f1dc87c86053b5edbc17d5d7.tar.bz2 icestorm-6e9a2da5c46edf00f1dc87c86053b5edbc17d5d7.zip | |
Merge pull request #109 from daveshah1/up5k
Support for new UltraPlus features
Diffstat (limited to 'icepack')
| -rw-r--r-- | icepack/icepack.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/icepack/icepack.cc b/icepack/icepack.cc index 83b4e33..b67241f 100644 --- a/icepack/icepack.cc +++ b/icepack/icepack.cc @@ -703,7 +703,7 @@ void FpgaConfig::read_ascii(std::istream &ifs) continue; } - if (command == ".io_tile" || command == ".logic_tile" || command == ".ramb_tile" || command == ".ramt_tile" || command.substr(0, 4) == ".dsp" || command == ".ipconn_tile") + if (command == ".io_tile" || command == ".logic_tile" || command == ".ramb_tile" || command == ".ramt_tile" || command.substr(0, 4) == ".dsp" || command == ".ipcon_tile") { if (!got_device) error("Missing .device statement before %s.\n", command.c_str()); @@ -1032,7 +1032,7 @@ string FpgaConfig::tile_type(int x, int y) const return "dsp2"; if( (y == 8) || (y == 13) || (y == 18) || (y == 26)) return "dsp3"; - return "ipconn"; + return "ipcon"; } if ((x == 0 || x == this->chip_width()+1) || (y == 0 || y == this->chip_height()+1)) return "io"; @@ -1064,7 +1064,7 @@ int FpgaConfig::tile_width(const string &type) const if (type == "ramt") return 42; if (type == "io") return 18; if (type.substr(0, 3) == "dsp") return 54; - if (type == "ipconn") return 54; + if (type == "ipcon") return 54; panic("Unknown tile type '%s'.\n", type.c_str()); } |