caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use unified io location data

Browse Source
This commit is contained in:
Miodrag Milanovic 2023-03-18 13:53:27 +01:00 committed by myrtle
parent 0ce72e1a31
commit 3f4c8d15d9
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
machxo2/facade_import.py
View File

@ -181,14 +181,7 @@ def process_pio_db(rg, device):
for name, pinloc in sorted(pkgdata.items()): for name, pinloc in sorted(pkgdata.items()):
x = pinloc["col"] x = pinloc["col"]
y = pinloc["row"] y = pinloc["row"]
if x == 0 or x == max_col:
# FIXME: Oversight in read_pinout.py. We use 0-based
# columns for 0 and max row, but we otherwise extract
# the names from the CSV, and...
loc = pytrellis.Location(x, y) loc = pytrellis.Location(x, y)
else:
# Lattice uses 1-based columns!
loc = pytrellis.Location(x - 1, y)
pio = "PIO" + pinloc["pio"] pio = "PIO" + pinloc["pio"]
bel_idx = get_bel_index(rg, loc, pio) bel_idx = get_bel_index(rg, loc, pio)
if bel_idx is not None: if bel_idx is not None:
@ -197,10 +190,7 @@ def process_pio_db(rg, device):
for metaitem in piodb["pio_metadata"]: for metaitem in piodb["pio_metadata"]:
x = metaitem["col"] x = metaitem["col"]
y = metaitem["row"] y = metaitem["row"]
if x == 0 or x == max_col:
loc = pytrellis.Location(x, y) loc = pytrellis.Location(x, y)
else:
loc = pytrellis.Location(x - 1, y)
pio = "PIO" + metaitem["pio"] pio = "PIO" + metaitem["pio"]
bank = metaitem["bank"] bank = metaitem["bank"]
if "function" in metaitem: if "function" in metaitem: