diff options
| author | William D. Jones <thor0505@comcast.net> | 2021-01-31 23:29:04 -0500 |
|---|---|---|
| committer | gatecat <gatecat@ds0.me> | 2021-02-12 10:36:59 +0000 |
| commit | c9487293e9e85a34879a3e5a45b637c7f24e5584 (patch) | |
| tree | 4108ef44c9f505507cecdd139610f6f3a74882fc | |
| parent | d0b822c0365c52a8a8439094f2268cfa0c461b5e (diff) | |
| download | nextpnr-c9487293e9e85a34879a3e5a45b637c7f24e5584.tar.gz nextpnr-c9487293e9e85a34879a3e5a45b637c7f24e5584.tar.bz2 nextpnr-c9487293e9e85a34879a3e5a45b637c7f24e5584.zip | |
machxo2: Fix REGMODE identifier (per slice, not per-FF).
| -rw-r--r-- | machxo2/cells.cc | 3 | ||||
| -rw-r--r-- | machxo2/constids.inc | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/machxo2/cells.cc b/machxo2/cells.cc index dd673c38..20e68ab5 100644 --- a/machxo2/cells.cc +++ b/machxo2/cells.cc @@ -59,12 +59,11 @@ std::unique_ptr<CellInfo> create_machxo2_cell(Context *ctx, IdString type, std:: new_cell->params[id_LSRONMUX] = std::string("LSRMUX"); new_cell->params[id_LUT0_INITVAL] = Property(0xFFFF, 16); new_cell->params[id_LUT1_INITVAL] = Property(0xFFFF, 16); + new_cell->params[id_REGMODE] = std::string("FF"); new_cell->params[id_REG0_SD] = std::string("1"); new_cell->params[id_REG1_SD] = std::string("1"); new_cell->params[id_REG0_REGSET] = std::string("SET"); new_cell->params[id_REG1_REGSET] = std::string("SET"); - new_cell->params[id_REG0_REGMODE] = std::string("FF"); - new_cell->params[id_REG1_REGMODE] = std::string("FF"); new_cell->params[id_CCU2_INJECT1_0] = std::string("YES"); new_cell->params[id_CCU2_INJECT1_1] = std::string("YES"); new_cell->params[id_WREMUX] = std::string("INV"); diff --git a/machxo2/constids.inc b/machxo2/constids.inc index b60cfe54..b2ff51ae 100644 --- a/machxo2/constids.inc +++ b/machxo2/constids.inc @@ -50,12 +50,11 @@ X(LSRMUX) X(LSRONMUX) X(LUT0_INITVAL) X(LUT1_INITVAL) +X(REGMODE) X(REG0_SD) X(REG1_SD) X(REG0_REGSET) X(REG1_REGSET) -X(REG0_REGMODE) -X(REG1_REGMODE) X(CCU2_INJECT1_0) X(CCU2_INJECT1_1) X(WREMUX) @@ -66,7 +65,6 @@ X(DI) X(Q) X(REGSET) -X(REGMODE) X(FACADE_IO) |