diff options
Diffstat (limited to 'ice40')
| -rw-r--r-- | ice40/arch.h | 4 | ||||
| -rw-r--r-- | ice40/bitstream.cc | 2 | ||||
| -rw-r--r-- | ice40/main.cc | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/ice40/arch.h b/ice40/arch.h index b992d192..90117939 100644 --- a/ice40/arch.h +++ b/ice40/arch.h @@ -417,8 +417,8 @@ struct Arch : BaseCtx // ------------------------------------------------- - int getGridDimX() const { return 34; } - int getGridDimY() const { return 34; } + int getGridDimX() const { return chip_info->width; } + int getGridDimY() const { return chip_info->height; } int getTileBelDimZ(int, int) const { return 8; } int getTilePipDimZ(int, int) const { return 1; } diff --git a/ice40/bitstream.cc b/ice40/bitstream.cc index e56ed37d..4cfed52d 100644 --- a/ice40/bitstream.cc +++ b/ice40/bitstream.cc @@ -702,6 +702,8 @@ void write_asc(const Context *ctx, std::ostream &out) setColBufCtrl = (y == 8 || y == 9 || y == 24 || y == 25);
} else if (ctx->args.type == ArchArgs::UP5K) {
setColBufCtrl = (y == 4 || y == 5 || y == 14 || y == 15 || y == 26 || y == 27);
+ } else if (ctx->args.type == ArchArgs::LP384) {
+ setColBufCtrl = false;
}
if (setColBufCtrl) {
set_config(ti, config.at(y).at(x), "ColBufCtrl.glb_netwk_0", true);
diff --git a/ice40/main.cc b/ice40/main.cc index 8bab360d..fcc56d04 100644 --- a/ice40/main.cc +++ b/ice40/main.cc @@ -43,7 +43,7 @@ class Ice40CommandHandler : public CommandHandler void customBitstream(Context *ctx) override; protected: - po::options_description getArchOptions(); + po::options_description getArchOptions() override; }; Ice40CommandHandler::Ice40CommandHandler(int argc, char **argv) : CommandHandler(argc, argv) {} |