diff options
| author | David Shah <davey1576@gmail.com> | 2018-09-24 14:27:50 +0100 |
|---|---|---|
| committer | David Shah <davey1576@gmail.com> | 2018-09-24 14:27:50 +0100 |
| commit | 9834b68041f8bc015d0195303b81636047d86b1c (patch) | |
| tree | 89ddad2b31e950d6fb11a27a38870c28ef96a599 | |
| parent | e7fe046e571aa007fcb2e10af0a097b839bfef0c (diff) | |
| download | nextpnr-9834b68041f8bc015d0195303b81636047d86b1c.tar.gz nextpnr-9834b68041f8bc015d0195303b81636047d86b1c.tar.bz2 nextpnr-9834b68041f8bc015d0195303b81636047d86b1c.zip | |
ice40: Remove obsolete belType member
Signed-off-by: David Shah <davey1576@gmail.com>
| -rw-r--r-- | ice40/arch.cc | 1 | ||||
| -rw-r--r-- | ice40/arch_place.cc | 2 | ||||
| -rw-r--r-- | ice40/archdefs.h | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/ice40/arch.cc b/ice40/arch.cc index 3983a24e..7ce967ec 100644 --- a/ice40/arch.cc +++ b/ice40/arch.cc @@ -959,7 +959,6 @@ void Arch::assignArchInfo() void Arch::assignCellInfo(CellInfo *cell) { - cell->belType = cell->type; if (cell->type == id_ICESTORM_LC) { cell->lcInfo.dffEnable = bool_or_default(cell->params, id_DFF_ENABLE); cell->lcInfo.carryEnable = bool_or_default(cell->params, id_CARRY_ENABLE); diff --git a/ice40/arch_place.cc b/ice40/arch_place.cc index c69fd34f..a050e39f 100644 --- a/ice40/arch_place.cc +++ b/ice40/arch_place.cc @@ -34,7 +34,7 @@ bool Arch::logicCellsCompatible(const CellInfo** it, const size_t size) const int locals_count = 0; for (auto cell : boost::make_iterator_range(it, it+size)) { - NPNR_ASSERT(cell->belType == id_ICESTORM_LC); + NPNR_ASSERT(cell->type == id_ICESTORM_LC); if (cell->lcInfo.dffEnable) { if (!dffs_exist) { dffs_exist = true; diff --git a/ice40/archdefs.h b/ice40/archdefs.h index 360617fd..8e20de23 100644 --- a/ice40/archdefs.h +++ b/ice40/archdefs.h @@ -134,7 +134,6 @@ struct NetInfo; struct ArchCellInfo { - IdString belType; union { struct |