Added 4k cb132 package

5 files changed, 193 insertions, 6 deletions

diff --git a/icebox/icebox.py b/icebox/icebox.py
index b7f96d2..97a6a65 100644
--- a/icebox/icebox.py
+++ b/icebox/icebox.py
@@ -1580,6 +1580,7 @@ ieren_db = {
         (13,  0, 0, 13,  0, 0),
         (13,  0, 1, 13,  0, 1),
         (13, 33, 0, 13, 33, 0),
+        (13, 33, 1, 13, 33, 1),
         (14,  0, 0, 14,  0, 0),
         (14,  0, 1, 14,  0, 1),
         (14, 33, 1, 14, 33, 1),
@@ -1604,6 +1605,7 @@ ieren_db = {
         (20, 33, 1, 20, 33, 1),
         (21,  0, 0, 21,  0, 0),
         (21,  0, 1, 21,  0, 1),
+        (21, 33, 1, 21, 33, 1),
         (22,  0, 1, 22,  0, 1),
         (22, 33, 0, 22, 33, 0),
         (22, 33, 1, 22, 33, 1),
@@ -1935,6 +1937,103 @@ pinloc_db = {
         ( "B8",  0,  5, 0),
         ( "B9",  0,  3, 0),
     ],
+    "8k-cb132:4k": [
+        ( "A1",  2, 33, 0),
+        ("A10", 25, 33, 0),
+        ("A11", 26, 33, 0),
+        ("A12", 30, 33, 1),
+        ( "A2",  3, 33, 0),
+        ( "A3",  3, 33, 1),
+        ( "A4",  5, 33, 0),
+        ( "A5", 10, 33, 1),
+        ( "A6", 16, 33, 1),
+        ( "A7", 17, 33, 0),
+        ( "B1",  0, 30, 1),
+        ("B14", 33, 28, 0),
+        ( "C1",  0, 30, 0),
+        ("C10", 22, 33, 1),
+        ("C11", 28, 33, 1),
+        ("C12", 29, 33, 1),
+        ("C14", 33, 24, 1),
+        ( "C3",  0, 27, 1),
+        ( "C4",  4, 33, 0),
+        ( "C5",  8, 33, 1),
+        ( "C6", 11, 33, 1),
+        ( "C7", 14, 33, 1),
+        ( "C9", 20, 33, 1),
+        ( "D1",  0, 25, 1),
+        ("D10", 27, 33, 0),
+        ("D11", 26, 33, 1),
+        ("D12", 33, 27, 1),
+        ("D14", 33, 23, 1),
+        ( "D3",  0, 27, 0),
+        ( "D4",  0, 22, 1),
+        ( "D5",  9, 33, 0),
+        ( "D6", 11, 33, 0),
+        ( "D7", 13, 33, 1),
+        ( "D9", 21, 33, 1),
+        ( "E1",  0, 25, 0),
+        ("E11", 33, 20, 1),
+        ("E12", 33, 21, 0),
+        ("E14", 33, 21, 1),
+        ( "E4",  0, 22, 0),
+        ("F11", 33, 19, 1),
+        ("F12", 33, 15, 0),
+        ("F14", 33, 16, 1),
+        ( "F3",  0, 21, 0),
+        ( "F4",  0, 21, 1),
+        ( "G1",  0, 17, 0),
+        ("G11", 33, 14, 1),
+        ("G12", 33, 11, 0),
+        ("G14", 33, 17, 0),
+        ( "G3",  0, 17, 1),
+        ( "G4",  0, 20, 0),
+        ( "H1",  0, 16, 1),
+        ("H11", 33, 10, 1),
+        ("H12", 33,  6, 1),
+        ( "H3",  0, 16, 0),
+        ( "H4",  0, 20, 1),
+        ( "J1",  0, 18, 0),
+        ("J11", 33,  6, 0),
+        ("J12", 33,  5, 1),
+        ( "J3",  0, 18, 1),
+        ("K11", 33,  4, 1),
+        ("K12", 33,  4, 0),
+        ("K14", 33,  5, 0),
+        ( "K3",  0, 11, 1),
+        ( "K4",  0, 11, 0),
+        ( "L1",  0,  6, 1),
+        ("L12", 33,  2, 0),
+        ("L14", 33,  3, 1),
+        ( "L4", 12,  0, 0),
+        ( "L5", 11,  0, 1),
+        ( "L6", 15,  0, 0),
+        ( "L8", 20,  0, 1),
+        ( "L9", 29,  0, 0),
+        ( "M1",  0,  6, 0),
+        ("M11", 30,  0, 0),
+        ("M12", 33,  1, 0),
+        ( "M3",  8,  0, 0),
+        ( "M4",  7,  0, 1),
+        ( "M6", 14,  0, 1),
+        ( "M7", 15,  0, 1),
+        ( "M9", 22,  0, 1),
+        ( "N1",  0,  4, 1),
+        ("N14", 33,  2, 1),
+        ( "P1",  0,  4, 0),
+        ("P10", 29,  0, 1),
+        ("P11", 30,  0, 1),
+        ("P12", 31,  0, 0),
+        ("P13", 31,  0, 1),
+        ("P14", 33,  1, 1),
+        ( "P2",  4,  0, 0),
+        ( "P3",  5,  0, 1),
+        ( "P4", 12,  0, 1),
+        ( "P5", 13,  0, 0),
+        ( "P7", 16,  0, 1),
+        ( "P8", 17,  0, 0),
+        ( "P9", 21,  0, 1),
+    ],
     "8k-ct256": [
         ( "A1",  4, 33, 1),
         ("A10", 22, 33, 1),
diff --git a/icefuzz/icecube.sh b/icefuzz/icecube.sh
index dc1d281..05257e1 100644
--- a/icefuzz/icecube.sh
+++ b/icefuzz/icecube.sh
@@ -67,6 +67,10 @@ case "${ICEDEV:-hx1k-tq144}" in
 		iCEPACKAGE="TQ144"
 		iCE40DEV="iCE40HX1K"
 		;;
+	hx4k-cb132)
+		iCEPACKAGE="CB132"
+		iCE40DEV="iCE40HX4K"
+		;;
 	hx8k-cm225)
 		iCEPACKAGE="CM225"
 		iCE40DEV="iCE40HX8K"
@@ -102,6 +106,11 @@ case "$iCE40DEV" in
 		libfile="ice40HX1K.lib"
 		devfile="ICE40P01.dev"
 		;;
+	iCE40HX4K)
+		icetech="SBTiCE40"
+		libfile="ice40HX8K.lib"
+		devfile="ICE40P04.dev"
+		;;
 	iCE40HX8K)
 		icetech="SBTiCE40"
 		libfile="ice40HX8K.lib"
diff --git a/icefuzz/pinloc/pinloc-1k-cb132.sh b/icefuzz/pinloc/pinloc-1k-cb132.sh
index 19e05c3..fabcd66 100644
--- a/icefuzz/pinloc/pinloc-1k-cb132.sh
+++ b/icefuzz/pinloc/pinloc-1k-cb132.sh
@@ -1,12 +1,15 @@
 #!/bin/bash
 
 pins="
-	B1 C1 C3 D3 D4 E4 D1 E1 F4 F3 H3 H1 G1 G3 G4 H4 J1 J3 K4 K3 M1 L1 P1 N1 M3
-	L4 P2 P3 M4 L5 P4 L6 P5 M6 P7 P8 M7 P9 L7 M8 L8 M9 L9 P10 M10 L10 M11 P11
-	P12 P13 L11 M12 P14 L12 N14 M14 L14 K12 K11 K14 J12 J11 H12 H11 F14 G14
-	G12 G11 F12 E14 F11 E12 D14 C14 E11 B14 D12 A14 A13 C12 A12 C11 C10 D11
-	A10 D10 C9 D9 C8 D8 A7 A6 C7 D7 C6 A5 A4 D6 C5 A2 D5 A1 C4 A9 F1 F7 G7 G8
-	G9 H6 H7 H8 J14 J8 L3 P6 F8 G6 H9 J4 J7 A8 F6 F9 H14 J9 M5 E3 J6 K1 A3 A11
+	A1 A2 A4 A5 A6 A7 A10 A12 B1 B14
+	C1 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C14
+	D1 D3 D4 D5 D6 D7 D8 D9 D10 D11 D12 D14
+	E1 E4 E11 E12 E14 F3 F4 F11 F12 F14
+	G1 G3 G4 G11 G12 G14 H1 H3 H4 H11 H12
+	J1 J3 J11 J12 K3 K4 K11 K12 K14
+	L1 L4 L5 L6 L7 L8 L9 L12 L14
+	M1 M3 M4 M6 M7 M8 M9 M11 M12 N14
+	P2 P3 P4 P5 P7 P8 P9 P10 P11 P12 P13 P14
 "
 
 {
diff --git a/icefuzz/pinloc/pinloc-4k-cb132.sh b/icefuzz/pinloc/pinloc-4k-cb132.sh
new file mode 100644
index 0000000..bc20c86
--- /dev/null
+++ b/icefuzz/pinloc/pinloc-4k-cb132.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+pins="
+	A1 A2 A3 A4 A5 A6 A7 A10 A11 A12 B1 B14
+	C1 C3 C4 C5 C6 C7 C9 C10 C11 C12 C14
+	D1 D3 D4 D5 D6 D7 D9 D10 D11 D12 D14
+	E1 E4 E11 E12 E14 F3 F4 F11 F12 F14
+	G1 G3 G4 G11 G12 G14 H1 H3 H4 H11 H12
+	J1 J3 J11 J12 K3 K4 K11 K12 K14
+	L1 L4 L5 L6 L8 L9 L12 L14
+	M1 M3 M4 M6 M7 M9 M11 M12 N1 N14
+	P1 P2 P3 P4 P5 P7 P8 P9 P10 P11 P12 P13 P14
+"
+
+{
+	echo -n "all:"
+	for pin in $pins; do
+		id="pinloc-4k-cb132_${pin}"
+		echo -n " ${id}.exp"
+	done
+	echo
+
+	for pin in $pins; do
+		id="pinloc-4k-cb132_${pin}"
+		echo "module top(output y); assign y = 0; endmodule" > ${id}.v
+		echo "set_io y ${pin}" >> ${id}.pcf
+		echo; echo "${id}.exp:"
+		echo "	ICEDEV=hx4k-cb132 bash ../icecube.sh ${id} > ${id}.log 2>&1"
+		echo "	../../icebox/icebox_explain.py ${id}.asc > ${id}.exp.new"
+		echo "	rm -rf ${id}.tmp"
+		echo "	mv ${id}.exp.new ${id}.exp"
+	done
+} >  pinloc-4k-cb132.mk
+
+set -ex
+make -f pinloc-4k-cb132.mk -j4
+python3 pinlocdb.py pinloc-4k-cb132_*.exp > pinloc-4k-cb132.txt
+
diff --git a/icefuzz/pinloc/pinloc-8k-cb132.sh b/icefuzz/pinloc/pinloc-8k-cb132.sh
new file mode 100644
index 0000000..655fefc
--- /dev/null
+++ b/icefuzz/pinloc/pinloc-8k-cb132.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+pins="
+	A1 A2 A3 A4 A5 A6 A7 A10 A11 A12 B1 B14
+	C1 C3 C4 C5 C6 C7 C9 C10 C11 C12 C14
+	D1 D3 D4 D5 D6 D7 D9 D10 D11 D12 D14
+	E1 E4 E11 E12 E14 F3 F4 F11 F12 F14
+	G1 G3 G4 G11 G12 G14 H1 H3 H4 H11 H12
+	J1 J3 J11 J12 K3 K4 K11 K12 K14
+	L1 L4 L5 L6 L8 L9 L12 L14
+	M1 M3 M4 M6 M7 M9 M11 M12 N1 N14
+	P1 P2 P3 P4 P5 P7 P8 P9 P10 P11 P12 P13 P14
+"
+
+{
+	echo -n "all:"
+	for pin in $pins; do
+		id="pinloc-8k-cb132_${pin}"
+		echo -n " ${id}.exp"
+	done
+	echo
+
+	for pin in $pins; do
+		id="pinloc-8k-cb132_${pin}"
+		echo "module top(output y); assign y = 0; endmodule" > ${id}.v
+		echo "set_io y ${pin}" >> ${id}.pcf
+		echo; echo "${id}.exp:"
+		echo "	ICEDEV=hx8k-cb132 bash ../icecube.sh ${id} > ${id}.log 2>&1"
+		echo "	../../icebox/icebox_explain.py ${id}.asc > ${id}.exp.new"
+		echo "	rm -rf ${id}.tmp"
+		echo "	mv ${id}.exp.new ${id}.exp"
+	done
+} >  pinloc-8k-cb132.mk
+
+set -ex
+make -f pinloc-8k-cb132.mk -j4
+python3 pinlocdb.py pinloc-8k-cb132_*.exp > pinloc-8k-cb132.txt
+