aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2017-07-31 15:55:07 +0200
committerClifford Wolf <clifford@clifford.at>2017-07-31 15:55:07 +0200
commit72d2a0281073c64883510d06dcc5a025f973fbdd (patch)
treec5c1878ed4b418ab70e31c6bb1192a15e1ef8e36
parent68e25c22e182eb0d044753c708f2b8518358906c (diff)
downloadicestorm-72d2a0281073c64883510d06dcc5a025f973fbdd.tar.gz
icestorm-72d2a0281073c64883510d06dcc5a025f973fbdd.tar.bz2
icestorm-72d2a0281073c64883510d06dcc5a025f973fbdd.zip
Remove extra IoCtrl cf_bit_ and extra_padeb_test_ lines from database
-rw-r--r--icebox/iceboxdb.py4
-rw-r--r--icefuzz/database.py3
2 files changed, 3 insertions, 4 deletions
diff --git a/icebox/iceboxdb.py b/icebox/iceboxdb.py
index 46bf345..63f2079 100644
--- a/icebox/iceboxdb.py
+++ b/icebox/iceboxdb.py
@@ -25,10 +25,6 @@ B6[3] IoCtrl IE_1
B8[2] IoCtrl LVDS
B6[2] IoCtrl REN_0
B1[3] IoCtrl REN_1
-B6[15] IoCtrl cf_bit_35
-B12[15] IoCtrl cf_bit_39
-B15[14] IoCtrl extra_padeb_test_0
-B14[15] IoCtrl extra_padeb_test_1
B9[13],B15[13] NegClk
B0[2] PLL PLLCONFIG_1
B0[3] PLL PLLCONFIG_2
diff --git a/icefuzz/database.py b/icefuzz/database.py
index 50a28fc..8cb81d8 100644
--- a/icefuzz/database.py
+++ b/icefuzz/database.py
@@ -40,6 +40,9 @@ def read_database(filename, tile_type):
if bit == "B9[3]" and line == ['IoCtrl', 'IE_1']: continue
if bit == "B1[3]" and line == ['IoCtrl', 'REN_0']: continue
if bit == "B6[2]" and line == ['IoCtrl', 'REN_1']: continue
+ # Ignore some additional configuration bits that sneaked in via ice5k fuzzing
+ if line[0] == "IoCtrl" and line[1].startswith("cf_bit_"): continue
+ if line[0] == "IoCtrl" and line[1].startswith("extra_padeb_test_"): continue
raw_db.append((bit, (line[0], line[1])))
elif line[0] in ("IOB_0", "IOB_1"):
if line[1] != "IO":