icefuzz improvements (hacks for sbtimer device info)

1 files changed, 5 insertions, 13 deletions

diff --git a/icefuzz/make_pll.py b/icefuzz/make_pll.py
index 7db509a..36ed8db 100644
--- a/icefuzz/make_pll.py
+++ b/icefuzz/make_pll.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+from fuzzconfig import *
 import numpy as np
 import os
 
@@ -8,17 +9,8 @@ from numpy.random import randint, choice, permutation
 def randbin(n):
     return  "".join([choice(["0", "1"]) for i in range(n)])
 
-num = 20
-
-pins = [int(i) for i in """
-    1 2 3 4 7 8 9 10 11 12 19 20 21 22 23 24 25 26 28 29 31 32 33 34
-    37 38 39 41 42 43 44 45 47 48 49 50 52 56 58 60 61 62 63 64 67 68 70 71
-    73 74 75 76 78 79 80 81 87 88 90 91 93 94 95 96 97 98 99 101 102 104 105 106 107
-    112 113 114 115 116 117 118 119 120 121 122 128 129 134 135 136 137 138 139 141 142 143 144
-""".split()]
-
-pins.remove(49)
-pins.remove(50)
+pins.remove("49")
+pins.remove("50")
 
 os.system("rm -rf work_pll")
 os.mkdir("work_pll")
@@ -126,8 +118,8 @@ for idx in range(num):
 
     with open("work_pll/pll_%02d.pcf" % idx, "w") as f:
         for pll_pin, package_pin in zip(pin_names, list(permutation(pins))[0:len(pin_names)]):
-            if pll_pin == "packagepin": package_pin = 49
-            print("set_io %s %d" % (pll_pin, package_pin), file=f)
+            if pll_pin == "packagepin": package_pin = "49"
+            print("set_io %s %s" % (pll_pin, package_pin), file=f)
 
 with open("work_pll/Makefile", "w") as f:
     print("all: %s" % " ".join(["pll_%02d.bin" % i for i in range(num)]), file=f)