Move TileType array to ice40 chipdb blob

Signed-off-by: Clifford Wolf <clifford@clifford.at>

2 files changed, 14 insertions, 7 deletions

diff --git a/ice40/chip.h b/ice40/chip.h
index 136c33b7..2c7b7d0e 100644
--- a/ice40/chip.h
+++ b/ice40/chip.h
@@ -156,7 +156,7 @@ struct PackageInfoPOD
     PackagePinPOD *pins;
 } __attribute__((packed));
 
-enum TileType
+enum TileType : uint32_t
 {
     TILE_NONE = 0,
     TILE_LOGIC = 1,
diff --git a/ice40/chipdb.py b/ice40/chipdb.py
index 98a064ba..c6511e4e 100644
--- a/ice40/chipdb.py
+++ b/ice40/chipdb.py
@@ -44,6 +44,7 @@ cbit_re = re.compile(r'B(\d+)\[(\d+)\]')
 
 portpins = dict()
 beltypes = dict()
+tiletypes = dict()
 
 with open("ice40/portpins.inc") as f:
     for line in f:
@@ -62,6 +63,12 @@ beltypes["ICESTORM_RAM"] = 2
 beltypes["SB_IO"] = 3
 beltypes["SB_GB"] = 4
 
+tiletypes["NONE"] = 0
+tiletypes["LOGIC"] = 1
+tiletypes["IO"] = 2
+tiletypes["RAMB"] = 3
+tiletypes["RAMT"] = 4
+
 def maj_wire_name(name):
     if re.match(r"lutff_\d/(in|out)", name[2]):
         return True
@@ -682,9 +689,9 @@ tilegrid = []
 for y in range(dev_height):
     for x in range(dev_width):
         if (x, y) in tiles:
-            tilegrid.append("TILE_%s" % (tiles[x, y].upper()))
+            tilegrid.append(tiles[x, y].upper())
         else:
-            tilegrid.append("TILE_NONE")
+            tilegrid.append("NONE")
 
 tileinfo = []
 for t in range(num_tile_types):
@@ -792,16 +799,16 @@ bba.r("tile_data_%s" % dev_name, "tiles_nonrouting")
 bba.r("switch_data_%s" % dev_name, "switches")
 bba.r("ieren_data_%s" % dev_name, "ierens")
 
+bba.l("tile_grid_%s" % dev_name, "TileType", export=True)
+for t in tilegrid:
+    bba.u32(tiletypes[t], "tiletype")
+
 bba.finalize()
 if compact_output:
     bba.write_compact_c(sys.stdout)
 else:
     bba.write_verbose_c(sys.stdout)
 
-print("static TileType tile_grid_%s[%d] = {" % (dev_name, len(tilegrid)))
-print("  " + ",\n  ".join(tilegrid))
-print("};")
-
 print("static PackageInfoPOD package_info_%s[%d] = {" % (dev_name, len(packageinfo)))
 print("  " + ",\n  ".join(packageinfo))
 print("};")