diff options
| -rw-r--r-- | ecp5/bitstream.cc | 4 | ||||
| -rwxr-xr-x | ecp5/trellis_import.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ecp5/bitstream.cc b/ecp5/bitstream.cc index 207ba048..bc8a6c55 100644 --- a/ecp5/bitstream.cc +++ b/ecp5/bitstream.cc @@ -178,7 +178,7 @@ static std::string get_pio_tile(Context *ctx, BelId bel) { static const std::set<std::string> pioabcd_l = {"PICL1", "PICL1_DQS0", "PICL1_DQS3"}; static const std::set<std::string> pioabcd_r = {"PICR1", "PICR1_DQS0", "PICR1_DQS3"}; - static const std::set<std::string> pioa_b = {"PICB0", "EFB0_PICB0", "EFB2_PICB0"}; + static const std::set<std::string> pioa_b = {"PICB0", "EFB0_PICB0", "EFB2_PICB0", "SPICB0"}; static const std::set<std::string> piob_b = {"PICB1", "EFB1_PICB1", "EFB3_PICB1"}; std::string pio_name = ctx->locInfo(bel)->bel_data[bel.index].name.get(); @@ -215,7 +215,7 @@ static std::string get_pic_tile(Context *ctx, BelId bel) static const std::set<std::string> picab_r = {"PICR0", "PICR0_DQS2"}; static const std::set<std::string> piccd_r = {"PICR2", "PICR2_DQS1", "MIB_CIB_LR_A"}; - static const std::set<std::string> pica_b = {"PICB0", "EFB0_PICB0", "EFB2_PICB0"}; + static const std::set<std::string> pica_b = {"PICB0", "EFB0_PICB0", "EFB2_PICB0", "SPICB0"}; static const std::set<std::string> picb_b = {"PICB1", "EFB1_PICB1", "EFB3_PICB1"}; std::string pio_name = ctx->locInfo(bel)->bel_data[bel.index].name.get(); diff --git a/ecp5/trellis_import.py b/ecp5/trellis_import.py index c8589b6c..a21c4b3d 100755 --- a/ecp5/trellis_import.py +++ b/ecp5/trellis_import.py @@ -521,7 +521,7 @@ def write_database(dev_name, chip, ddrg, endianness): loc, bel_idx, bank, func, dqs = pin write_loc(loc, "abs_loc") bba.u32(bel_idx, "bel_index") - if func is not None: + if func is not None and func != "WRITEN": bba.s(func, "function_name") else: bba.r(None, "function_name") |