diff options
| author | Clifford Wolf <clifford@clifford.at> | 2015-07-18 13:06:48 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2015-07-18 13:06:48 +0200 |
| commit | c41701ca3a2046e9cabe303cff0aa203215d70c1 (patch) | |
| tree | 6a6e26d8278505d72dda2b9c691a8906002bc608 /icepack | |
| parent | 0347c37d56374447d170e9a8f59e56f84cbefcce (diff) | |
| download | icestorm-c41701ca3a2046e9cabe303cff0aa203215d70c1.tar.gz icestorm-c41701ca3a2046e9cabe303cff0aa203215d70c1.tar.bz2 icestorm-c41701ca3a2046e9cabe303cff0aa203215d70c1.zip | |
Import of icestorm-snapshot-150413.zip
Diffstat (limited to 'icepack')
| -rw-r--r-- | icepack/icepack.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/icepack/icepack.cc b/icepack/icepack.cc index 1614c5e..f243e15 100644 --- a/icepack/icepack.cc +++ b/icepack/icepack.cc @@ -599,7 +599,7 @@ void FpgaConfig::read_ascii(std::istream &ifs) continue; } - if (command == ".io_tile" || command == ".logic_tile" || command == ".ram_tile") + if (command == ".io_tile" || command == ".logic_tile" || command == ".ramb_tile" || command == ".ramt_tile") { if (!got_device) error("Missing .device statement before %s.\n", command.c_str()); @@ -766,7 +766,7 @@ string FpgaConfig::tile_type(int x, int y) const if (this->device == "1k") { if ((x == 0 || x == this->chip_width()+1) && (y == 0 || y == this->chip_height()+1)) return "corner"; if ((x == 0 || x == this->chip_width()+1) || (y == 0 || y == this->chip_height()+1)) return "io"; - if (x == 3 || x == 10) return "ram"; + if (x == 3 || x == 10) return y % 2 == 1 ? "ramb" : "ramt"; return "logic"; } panic("Unkown chip type '%s'.\n", this->device.c_str()); @@ -776,7 +776,8 @@ int FpgaConfig::tile_width(const string &type) const { if (type == "corner") return 0; if (type == "logic") return 54; - if (type == "ram") return 42; + if (type == "ramb") return 42; + if (type == "ramt") return 42; if (type == "io") return 18; panic("Unkown tile type '%s'.\n", type.c_str()); } |