diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-06-12 14:33:13 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-06-12 14:33:13 +0200 |
| commit | c8b815361e2435bf12786705638908aa891df44f (patch) | |
| tree | 901849769576cf5364890b890c8c788f1d6f506b /ice40/cells.cc | |
| parent | 426fb75bb5c48d32d36bfbeaa89ec2c5eb8860c0 (diff) | |
| parent | 95fb0595a591dd68ccb4b39ec0b20738ac047978 (diff) | |
| download | nextpnr-c8b815361e2435bf12786705638908aa891df44f.tar.gz nextpnr-c8b815361e2435bf12786705638908aa891df44f.tar.bz2 nextpnr-c8b815361e2435bf12786705638908aa891df44f.zip | |
Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr
Diffstat (limited to 'ice40/cells.cc')
| -rw-r--r-- | ice40/cells.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ice40/cells.cc b/ice40/cells.cc index 7abf83ff..004bdb30 100644 --- a/ice40/cells.cc +++ b/ice40/cells.cc @@ -101,16 +101,18 @@ void dff_to_lc(CellInfo *dff, CellInfo *lc, bool pass_thru_lut) if (citer != config.end()) { if ((config.end() - citer) >= 2) { assert(*(citer++) == 'S'); - lc->params["ASYNC_SR"] = "1"; - } else { lc->params["ASYNC_SR"] = "0"; + } else { + lc->params["ASYNC_SR"] = "1"; } if (*citer == 'S') { + citer++; replace_port(dff, "S", lc, "SR"); lc->params["SET_NORESET"] = "1"; } else { assert(*citer == 'R'); + citer++; replace_port(dff, "R", lc, "SR"); lc->params["SET_NORESET"] = "0"; } |