diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-06-22 15:38:17 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-06-22 15:38:17 +0200 |
| commit | 001c6ceb5661976eb3f0146c1b819a7f2ad8ea7d (patch) | |
| tree | 06846f1268806265eaaa4d1ec97410e8c0045621 /ice40/bitstream.cc | |
| parent | 9b98a7175be440a6a59ddcc022615e04b8538bda (diff) | |
| parent | 56c09fc5e5f7fb5c299f7a0b52e839556146615d (diff) | |
| download | nextpnr-001c6ceb5661976eb3f0146c1b819a7f2ad8ea7d.tar.gz nextpnr-001c6ceb5661976eb3f0146c1b819a7f2ad8ea7d.tar.bz2 nextpnr-001c6ceb5661976eb3f0146c1b819a7f2ad8ea7d.zip | |
Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr
Diffstat (limited to 'ice40/bitstream.cc')
| -rw-r--r-- | ice40/bitstream.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/ice40/bitstream.cc b/ice40/bitstream.cc index 8754fef7..e722cea4 100644 --- a/ice40/bitstream.cc +++ b/ice40/bitstream.cc @@ -229,6 +229,16 @@ void write_asc(const Context *ctx, std::ostream &out) set_config(ti, config.at(iey).at(iex), "IoCtrl.REN_" + std::to_string(iez), !pullup); } + + if (ctx->args.type == ArchArgs::UP5K) { + if (iez == 0) { + set_config(ti, config.at(iey).at(iex), "IoCtrl.cf_bit_39", + !pullup); + } else if (iez == 1) { + set_config(ti, config.at(iey).at(iex), "IoCtrl.cf_bit_35", + !pullup); + } + } } else if (cell.second->type == ctx->id("SB_GB")) { // no cell config bits } else if (cell.second->type == ctx->id("ICESTORM_RAM")) { @@ -312,7 +322,8 @@ void write_asc(const Context *ctx, std::ostream &out) ctx->args.type == ArchArgs::HX8K) { setColBufCtrl = (y == 8 || y == 9 || y == 24 || y == 25); } else if (ctx->args.type == ArchArgs::UP5K) { - if (tile == TILE_LOGIC) { + if (tile == TILE_LOGIC || tile == TILE_RAMB || + tile == TILE_RAMT) { setColBufCtrl = (y == 4 || y == 5 || y == 14 || y == 15 || y == 26 || y == 27); } else { |