diff options
| author | hermitsoft <hermisu@mail.com> | 2017-03-08 20:30:45 +0100 |
|---|---|---|
| committer | hermitsoft <hermisu@mail.com> | 2017-03-08 20:30:45 +0100 |
| commit | 89fe3abc45120feebcfcceb443d88ce4d84caab0 (patch) | |
| tree | 6ea7ba68162cd4da34a54e9c46d315911ac1ff69 | |
| parent | 1a50795c2da3fd31ad021c8cfc03b1fead66e6c1 (diff) | |
| download | icestorm-89fe3abc45120feebcfcceb443d88ce4d84caab0.tar.gz icestorm-89fe3abc45120feebcfcceb443d88ce4d84caab0.tar.bz2 icestorm-89fe3abc45120feebcfcceb443d88ce4d84caab0.zip | |
Icebox builds chipdb-384, icebox.py data still to refine.
| -rw-r--r-- | icebox/Makefile | 2 | ||||
| -rw-r--r-- | icebox/icebox.py | 2 | ||||
| -rwxr-xr-x | icebox/icebox_chipdb.py | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/icebox/Makefile b/icebox/Makefile index 0948852..446fb18 100644 --- a/icebox/Makefile +++ b/icebox/Makefile @@ -1,6 +1,6 @@ include ../config.mk -all: chipdb-1k.txt chipdb-8k.txt # chipdb-384.txt +all: chipdb-384.txt chipdb-1k.txt chipdb-8k.txt chipdb-384.txt: icebox.py iceboxdb.py icebox_chipdb.py python3 icebox_chipdb.py -3 > chipdb-384.new diff --git a/icebox/icebox.py b/icebox/icebox.py index 35cd27a..a39fa53 100644 --- a/icebox/icebox.py +++ b/icebox/icebox.py @@ -3834,7 +3834,7 @@ logictile_8k_db.append([["B1[50]"], "CarryInSet"]) logictile_384_db.append([["B1[49]"], "buffer", "carry_in", "carry_in_mux"]) #384? logictile_384_db.append([["B1[50]"], "CarryInSet"]) -for db in [iotile_l_db, iotile_r_db, iotile_t_db, iotile_b_db, logictile_db, logictile_8k_db, rambtile_db, ramttile_db, rambtile_8k_db, ramttile_8k_db]: +for db in [iotile_l_db, iotile_r_db, iotile_t_db, iotile_b_db, logictile_db, logictile_8k_db, logictile_384_db, rambtile_db, ramttile_db, rambtile_8k_db, ramttile_8k_db]: for entry in db: if entry[1] in ("buffer", "routing"): entry[2] = netname_normalize(entry[2], ramb=(db == rambtile_db), ramt=(db == ramttile_db), ramb_8k=(db == rambtile_8k_db), ramt_8k=(db == ramttile_8k_db)) diff --git a/icebox/icebox_chipdb.py b/icebox/icebox_chipdb.py index 299ce5c..7988e6a 100755 --- a/icebox/icebox_chipdb.py +++ b/icebox/icebox_chipdb.py @@ -254,8 +254,9 @@ def print_tile_nonrouting_bits(tile_type, idx): print_tile_nonrouting_bits("logic", list(ic.logic_tiles.keys())[0]) print_tile_nonrouting_bits("io", list(ic.io_tiles.keys())[0]) -print_tile_nonrouting_bits("ramb", list(ic.ramb_tiles.keys())[0]) -print_tile_nonrouting_bits("ramt", list(ic.ramt_tiles.keys())[0]) +if not mode_384: + print_tile_nonrouting_bits("ramb", list(ic.ramb_tiles.keys())[0]) + print_tile_nonrouting_bits("ramt", list(ic.ramt_tiles.keys())[0]) print(".extra_cell 0 0 WARMBOOT") for key in sorted(icebox.warmbootinfo_db[ic.device]): |