aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shah <dave@ds0.me>2019-10-26 20:50:50 +0100
committerDavid Shah <dave@ds0.me>2019-10-26 20:50:50 +0100
commitbac833522239e75f9fd27ba4bc13bf44586fe162 (patch)
tree8fd6a0babaf175362dd8cdc0e9581a8a7d35a957
parent475fcd442520a1464ce6c3b1aecbea03aa158007 (diff)
downloadnextpnr-bac833522239e75f9fd27ba4bc13bf44586fe162.tar.gz
nextpnr-bac833522239e75f9fd27ba4bc13bf44586fe162.tar.bz2
nextpnr-bac833522239e75f9fd27ba4bc13bf44586fe162.zip
ecp5: Add constids for new timing cell types
Signed-off-by: David Shah <dave@ds0.me>
-rw-r--r--ecp5/constids.inc8
-rwxr-xr-xecp5/trellis_import.py2
2 files changed, 10 insertions, 0 deletions
diff --git a/ecp5/constids.inc b/ecp5/constids.inc
index 5e8fc7da..4b5e3a3a 100644
--- a/ecp5/constids.inc
+++ b/ecp5/constids.inc
@@ -1294,3 +1294,11 @@ X(P)
X(ECLKBRIDGECS)
X(SEL)
X(ECSOUT)
+
+X(IOLOGIC_MODE_IDDRX1F)
+X(IOLOGIC_MODE_IDDRX2F)
+X(IOLOGIC_MODE_IREG)
+X(IOLOGIC_MODE_ODDRX1F)
+X(IOLOGIC_MODE_ODDRX2F)
+X(IOLOGIC_MODE_OREG)
+X(IOLOGIC_MODE_TSREG)
diff --git a/ecp5/trellis_import.py b/ecp5/trellis_import.py
index 549b3080..ee960fd3 100755
--- a/ecp5/trellis_import.py
+++ b/ecp5/trellis_import.py
@@ -186,6 +186,8 @@ def process_timing_data():
max_delay = min(entry["rising"][2], entry["falling"][2])
delays.append((constids[from_pin], constids[to_pin], min_delay, max_delay))
elif entry["type"] == "SetupHold":
+ if type(entry["pin"]) is list:
+ continue
pin = constids[entry["pin"]]
clock = constids[entry["clock"][1]]
min_setup = entry["setup"][0]