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

Move PackageInfoPOD to ice40 chipdb blob

Browse Source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-06-17 15:53:17 +02:00
parent 5d46ff54ba
commit 6f4af8387e
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ice40/chip.cc
View File

@ -102,7 +102,7 @@ Chip::Chip(ChipArgs args) : args(args)
package_info = nullptr;
for (int i = 0; i < chip_info.num_packages; i++) {
if (chip_info.packages_data[i].name == args.package) {
if (chip_info.packages_data[i].name.get() == args.package) {
package_info = &(chip_info.packages_data[i]);
break;
}

6
ice40/chip.h
View File

@ -151,9 +151,9 @@ struct PackagePinPOD
struct PackageInfoPOD
{
const char *name;
int num_pins;
PackagePinPOD *pins;
RelPtr<char> name;
int32_t num_pins;
RelPtr<PackagePinPOD> pins;
} __attribute__((packed));
enum TileType : uint32_t

14
ice40/chipdb.py
View File

@ -679,11 +679,11 @@ for package in packages:
pin_bel = "X%d/Y%d/io%d" % (x, y, z)
bel_idx = bel_name.index(pin_bel)
pins_info.append((pinname, bel_idx))
bba.l("package_%s_pins" % safename, "PackagePinPOD", export=True)
bba.l("package_%s_pins" % safename, "PackagePinPOD")
for pi in pins_info:
bba.s(pi[0], "name")
bba.u32(pi[1], "bel_index")
packageinfo.append('{"%s", %d, package_%s_pins}' % (name, len(pins_info), safename))
packageinfo.append((name, len(pins_info), "package_%s_pins" % safename))
tilegrid = []
for y in range(dev_height):
@ -803,16 +803,18 @@ bba.l("tile_grid_%s" % dev_name, "TileType", export=True)
for t in tilegrid:
bba.u32(tiletypes[t], "tiletype")
bba.l("package_info_%s" % dev_name, "PackageInfoPOD", export=True)
for info in packageinfo:
bba.s(info[0], "name")
bba.u32(info[1], "num_pins")
bba.r(info[2], "pins")
bba.finalize()
if compact_output:
bba.write_compact_c(sys.stdout)
else:
bba.write_verbose_c(sys.stdout)
print("static PackageInfoPOD package_info_%s[%d] = {" % (dev_name, len(packageinfo)))
print(" " + ",\n ".join(packageinfo))
print("};")
print('} // namespace')
print('NEXTPNR_NAMESPACE_BEGIN')