diff options
| author | David Shah <dave@ds0.me> | 2019-08-08 08:36:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-08 08:36:37 +0100 |
| commit | e0a114fcb3389108bd5821e442b8deb78b532da7 (patch) | |
| tree | cbe279b2a938767cbbc15f57d6ff9d940b12dd55 /ecp5/bitstream.cc | |
| parent | 90364fc3fad72f8c23b7200160f1acc0343c94d9 (diff) | |
| parent | bb0b6e85ce713012cd90cd18882c7873888648a1 (diff) | |
| download | nextpnr-e0a114fcb3389108bd5821e442b8deb78b532da7.tar.gz nextpnr-e0a114fcb3389108bd5821e442b8deb78b532da7.tar.bz2 nextpnr-e0a114fcb3389108bd5821e442b8deb78b532da7.zip | |
Merge pull request #308 from YosysHQ/ecp5_ooc
Add out-of-context mode to ECP5 architecture
Diffstat (limited to 'ecp5/bitstream.cc')
| -rw-r--r-- | ecp5/bitstream.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ecp5/bitstream.cc b/ecp5/bitstream.cc index a4b345e6..1e0dcadc 100644 --- a/ecp5/bitstream.cc +++ b/ecp5/bitstream.cc @@ -789,15 +789,13 @@ void write_bitstream(Context *ctx, std::string base_config_file, std::string tex if (str_or_default(ci->params, ctx->id("MODE"), "LOGIC") == "CCU2") { cc.tiles[tname].add_enum(slice + ".CCU2.INJECT1_0", - str_or_default(ci->params, ctx->id("INJECT1_0"), "YES")); + str_or_default(ci->params, ctx->id("CCU2_INJECT1_0"), "YES")); cc.tiles[tname].add_enum(slice + ".CCU2.INJECT1_1", - str_or_default(ci->params, ctx->id("INJECT1_1"), "YES")); + str_or_default(ci->params, ctx->id("CCU2_INJECT1_1"), "YES")); } else { // Don't interfere with cascade mux wiring - cc.tiles[tname].add_enum(slice + ".CCU2.INJECT1_0", - str_or_default(ci->params, ctx->id("INJECT1_0"), "_NONE_")); - cc.tiles[tname].add_enum(slice + ".CCU2.INJECT1_1", - str_or_default(ci->params, ctx->id("INJECT1_1"), "_NONE_")); + cc.tiles[tname].add_enum(slice + ".CCU2.INJECT1_0", "_NONE_"); + cc.tiles[tname].add_enum(slice + ".CCU2.INJECT1_1", "_NONE_"); } if (str_or_default(ci->params, ctx->id("MODE"), "LOGIC") == "DPRAM" && slice == "SLICEA") { |