Intermediate step, re-routing the design according to the changes in schematics.

1 files changed, 142 insertions, 136 deletions

diff --git a/KiCAD/rev02_12.sch-bak b/KiCAD/rev02_12.sch-bak
index 25d07c0..650323c 100644
--- a/KiCAD/rev02_12.sch-bak
+++ b/KiCAD/rev02_12.sch-bak
@@ -15,14 +15,8 @@ Comment4 ""
 $EndDescr
 Text Notes 800  900  0    84   ~ 17
 Master Key Memory
-Text Notes 7300 7750 0    42   ~ 8
-Make AVR unable to read the\nMKM by installing this jumper
 Text Notes 13630 10230 0    84   ~ 17
 Master Key Memory
-Text Notes 7000 7850 1    60   ~ 12
-JP6
-Text Notes 7270 7850 1    60   ~ 12
-JP1Q
 $Comp
 L power:GND #GND_087
 U 1 1 58023F8C
@@ -56,33 +50,9 @@ F 3 "" H 11400 2500 70  0000 C CNN
 	1    11400 2500
 	1    0    0    -1  
 $EndComp
-$Comp
-L power:GND #GND_089
-U 1 1 58023F87
-P 7100 8050
-F 0 "#GND_089" H 7100 8050 20  0000 C CNN
-F 1 "+GND" H 7100 7980 30  0000 C CNN
-F 2 "" H 7100 8050 70  0000 C CNN
-F 3 "" H 7100 8050 70  0000 C CNN
-	1    7100 8050
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	7100 7950 7100 8050
 Wire Wire Line
 	9400 1050 9400 1450
 $Comp
-L Cryptech_Alpha:JP1Q JP6
-U 1 1 58023F7B
-P 7100 7650
-F 0 "JP6" H 7205 7680 60  0000 L BNN
-F 1 "~" H 7100 7650 50  0001 C CNN
-F 2 "Cryptech_Alpha_Footprints:PLS-2" H 7205 7680 60  0001 C CNN
-F 3 "" H 7100 7650 50  0001 C CNN
-	1    7100 7650
-	1    0    0    -1  
-$EndComp
-$Comp
 L FPGA_Lattice:ICE40UP5K-SG48ITR U11
 U 2 1 5EF0D127
 P 4700 2550
@@ -492,8 +462,6 @@ F 3 "" H 4700 1250 70  0000 C CNN
 	1    4700 1250
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	4700 1450 4700 1350
 $Comp
 L Cryptech_Alpha:3V3_BATT #3V3_BATT_0103
 U 1 1 5F0FB6ED
@@ -620,52 +588,6 @@ Wire Wire Line
 Connection ~ 5200 7100
 $Comp
 L Cryptech_Alpha:C-EUC0402 C?
-U 1 1 5F149FB8
-P 6400 1550
-AR Path="/57D849FD/5F149FB8" Ref="C?"  Part="1" 
-AR Path="/57D8509E/5F149FB8" Ref="C224"  Part="1" 
-F 0 "C224" V 6500 1600 60  0000 L BNN
-F 1 "0.1uF" V 6500 1200 60  0000 L BNN
-F 2 "Cryptech_Alpha_Footprints:C_0402" H 6240 1660 60  0001 C CNN
-F 3 "" H 6240 1660 60  0000 C CNN
-	1    6400 1550
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GND #GND_0236
-U 1 1 5F149FC2
-P 6200 1950
-F 0 "#GND_0236" H 6200 1950 20  0000 C CNN
-F 1 "+GND" H 6200 1880 30  0000 C CNN
-F 2 "" H 6200 1950 70  0000 C CNN
-F 3 "" H 6200 1950 70  0000 C CNN
-	1    6200 1950
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GND #GND_0238
-U 1 1 5F149FCC
-P 6400 1950
-F 0 "#GND_0238" H 6400 1950 20  0000 C CNN
-F 1 "+GND" H 6400 1880 30  0000 C CNN
-F 2 "" H 6400 1950 70  0000 C CNN
-F 3 "" H 6400 1950 70  0000 C CNN
-	1    6400 1950
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	6400 1950 6400 1750
-Wire Wire Line
-	6200 1750 6200 1950
-Wire Wire Line
-	6200 1450 6200 1350
-Wire Wire Line
-	6400 1450 6400 1350
-Connection ~ 4700 1350
-Wire Wire Line
-	4700 1350 4700 1250
-$Comp
-L Cryptech_Alpha:C-EUC0402 C?
 U 1 1 5F14E9EA
 P 10200 8300
 AR Path="/57D849FD/5F14E9EA" Ref="C?"  Part="1" 
@@ -727,17 +649,6 @@ F 3 "" H 5100 7500 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L Cryptech_Alpha:C-EUC0402 C222
-U 1 1 5F15426E
-P 6200 1650
-F 0 "C222" V 6100 1500 60  0000 R TNN
-F 1 "0.01uF" V 6100 1950 60  0000 R TNN
-F 2 "Cryptech_Alpha_Footprints:C_0402" H 6100 1750 60  0001 C CNN
-F 3 "" H 6100 1750 60  0000 C CNN
-	1    6200 1650
-	-1   0    0    1   
-$EndComp
-$Comp
 L Cryptech_Alpha:C-EUC0402 C225
 U 1 1 5F154973
 P 10000 8400
@@ -773,8 +684,8 @@ $Comp
 L Device:R R25
 U 1 1 5F0C809C
 P 3150 3150
-F 0 "R25" V 2700 3050 50  0000 C CNN
-F 1 "100" V 2700 3250 50  0000 C CNN
+F 0 "R25" V 3550 3050 50  0000 C CNN
+F 1 "100" V 3550 3250 50  0000 C CNN
 F 2 "Resistor_SMD:R_0805_2012Metric" V 3080 3150 50  0001 C CNN
 F 3 "~" H 3150 3150 50  0001 C CNN
 	1    3150 3150
@@ -784,8 +695,8 @@ $Comp
 L Device:R R28
 U 1 1 5F0CAE7D
 P 3150 3250
-F 0 "R28" V 2700 3150 50  0000 C CNN
-F 1 "100" V 2700 3350 50  0000 C CNN
+F 0 "R28" V 3550 3150 50  0000 C CNN
+F 1 "100" V 3550 3350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0805_2012Metric" V 3080 3250 50  0001 C CNN
 F 3 "~" H 3150 3250 50  0001 C CNN
 	1    3150 3250
@@ -795,8 +706,8 @@ $Comp
 L Device:R R29
 U 1 1 5F0CB078
 P 3150 3350
-F 0 "R29" V 2700 3250 50  0000 C CNN
-F 1 "100" V 2700 3450 50  0000 C CNN
+F 0 "R29" V 3550 3250 50  0000 C CNN
+F 1 "100" V 3550 3450 50  0000 C CNN
 F 2 "Resistor_SMD:R_0805_2012Metric" V 3080 3350 50  0001 C CNN
 F 3 "~" H 3150 3350 50  0001 C CNN
 	1    3150 3350
@@ -806,8 +717,8 @@ $Comp
 L Device:R R30
 U 1 1 5F0CB134
 P 3150 3450
-F 0 "R30" V 2700 3350 50  0000 C CNN
-F 1 "100" V 2700 3550 50  0000 C CNN
+F 0 "R30" V 3550 3350 50  0000 C CNN
+F 1 "100" V 3550 3550 50  0000 C CNN
 F 2 "Resistor_SMD:R_0805_2012Metric" V 3080 3450 50  0001 C CNN
 F 3 "~" H 3150 3450 50  0001 C CNN
 	1    3150 3450
@@ -838,10 +749,10 @@ ARM_SPI3_MISO
 Text Notes 13000 4050 0    84   ~ 17
 Programming Header\n(pinout according to FPGA-UG-02042-26.4\n"Programming Cables User Guide")
 $Comp
-L Cryptech_Alpha:3V3_BATT #3V3_BATT_?
+L Cryptech_Alpha:3V3_BATT #3V3_BATT_0104
 U 1 1 5F0EF584
 P 13900 4550
-F 0 "#3V3_BATT_?" H 13900 4550 20  0000 C CNN
+F 0 "#3V3_BATT_0104" H 13900 4550 20  0000 C CNN
 F 1 "+3V3_BATT" H 13900 4480 30  0000 C CNN
 F 2 "" H 13900 4550 70  0000 C CNN
 F 3 "" H 13900 4550 70  0000 C CNN
@@ -853,10 +764,10 @@ Wire Wire Line
 Wire Wire Line
 	13900 4750 14000 4750
 $Comp
-L power:GND #GND_?
+L power:GND #GND_0241
 U 1 1 5F0F2E04
 P 13900 6400
-F 0 "#GND_?" H 13900 6400 20  0000 C CNN
+F 0 "#GND_0241" H 13900 6400 20  0000 C CNN
 F 1 "+GND" H 13900 6330 30  0000 C CNN
 F 2 "" H 13900 6400 70  0000 C CNN
 F 3 "" H 13900 6400 70  0000 C CNN
@@ -894,8 +805,8 @@ L Cryptech_Alpha:C-EUC0402 C?
 U 1 1 5F112F44
 P 15150 5050
 AR Path="/57D849FD/5F112F44" Ref="C?"  Part="1" 
-AR Path="/57D8509E/5F112F44" Ref="C?"  Part="1" 
-F 0 "C?" V 15250 5100 60  0000 L BNN
+AR Path="/57D8509E/5F112F44" Ref="C228"  Part="1" 
+F 0 "C228" V 15250 5100 60  0000 L BNN
 F 1 "0.1uF" V 15250 4700 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 14990 5160 60  0001 C CNN
 F 3 "" H 14990 5160 60  0000 C CNN
@@ -903,10 +814,10 @@ F 3 "" H 14990 5160 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Cryptech_Alpha:C-EUC0402 C?
+L Cryptech_Alpha:C-EUC0402 C227
 U 1 1 5F112F4E
 P 14950 5150
-F 0 "C?" V 14850 5000 60  0000 R TNN
+F 0 "C227" V 14850 5000 60  0000 R TNN
 F 1 "0.01uF" V 14850 5450 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:C_0402" H 14850 5250 60  0001 C CNN
 F 3 "" H 14850 5250 60  0000 C CNN
@@ -914,18 +825,9 @@ F 3 "" H 14850 5250 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	4200 1850 3300 1850
-Wire Wire Line
 	5200 1850 6000 1850
 Text Label 5300 1850 0    50   ~ 0
 ICE40_CDONE
-Text Label 3400 1850 0    50   ~ 0
-ICE40_CRESET
-Wire Wire Line
-	4700 1350 6200 1350
-Wire Wire Line
-	6200 1350 6400 1350
-Connection ~ 6200 1350
 Wire Wire Line
 	14950 4950 14950 4750
 Wire Wire Line
@@ -936,10 +838,10 @@ Connection ~ 14950 4750
 Wire Wire Line
 	14950 4750 14950 4550
 $Comp
-L Cryptech_Alpha:3V3_BATT #3V3_BATT_?
+L Cryptech_Alpha:3V3_BATT #3V3_BATT_0105
 U 1 1 5F145EEE
 P 14950 4550
-F 0 "#3V3_BATT_?" H 14950 4550 20  0000 C CNN
+F 0 "#3V3_BATT_0105" H 14950 4550 20  0000 C CNN
 F 1 "+3V3_BATT" H 14950 4480 30  0000 C CNN
 F 2 "" H 14950 4550 70  0000 C CNN
 F 3 "" H 14950 4550 70  0000 C CNN
@@ -947,10 +849,10 @@ F 3 "" H 14950 4550 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #GND_?
+L power:GND #GND_0242
 U 1 1 5F1460D0
 P 14950 5650
-F 0 "#GND_?" H 14950 5650 20  0000 C CNN
+F 0 "#GND_0242" H 14950 5650 20  0000 C CNN
 F 1 "+GND" H 14950 5580 30  0000 C CNN
 F 2 "" H 14950 5650 70  0000 C CNN
 F 3 "" H 14950 5650 70  0000 C CNN
@@ -958,10 +860,10 @@ F 3 "" H 14950 5650 70  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #GND_?
+L power:GND #GND_0243
 U 1 1 5F146406
 P 15150 5650
-F 0 "#GND_?" H 15150 5650 20  0000 C CNN
+F 0 "#GND_0243" H 15150 5650 20  0000 C CNN
 F 1 "+GND" H 15150 5580 30  0000 C CNN
 F 2 "" H 15150 5650 70  0000 C CNN
 F 3 "" H 15150 5650 70  0000 C CNN
@@ -977,8 +879,8 @@ L Cryptech_Alpha:R-EU_R0402 R?
 U 1 1 5F1532CF
 P 13600 5850
 AR Path="/57D84C13/5F1532CF" Ref="R?"  Part="1" 
-AR Path="/57D8509E/5F1532CF" Ref="R?"  Part="1" 
-F 0 "R?" V 13540 5530 60  0000 L BNN
+AR Path="/57D8509E/5F1532CF" Ref="R33"  Part="1" 
+F 0 "R33" V 13540 5530 60  0000 L BNN
 F 1 "4.7k" V 13650 5530 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 13650 5530 60  0001 C CNN
 F 3 "" H 13650 5530 60  0000 C CNN
@@ -986,10 +888,10 @@ F 3 "" H 13650 5530 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L power:GND #GND_?
+L power:GND #GND_0244
 U 1 1 5F1576E8
 P 13600 6400
-F 0 "#GND_?" H 13600 6400 20  0000 C CNN
+F 0 "#GND_0244" H 13600 6400 20  0000 C CNN
 F 1 "+GND" H 13600 6330 30  0000 C CNN
 F 2 "" H 13600 6400 70  0000 C CNN
 F 3 "" H 13600 6400 70  0000 C CNN
@@ -1010,8 +912,8 @@ L Cryptech_Alpha:LEDCHIP-LED0603 LED?
 U 1 1 5F17C1AC
 P 15300 7950
 AR Path="/57D85B19/5F17C1AC" Ref="LED?"  Part="1" 
-AR Path="/57D8509E/5F17C1AC" Ref="LED?"  Part="1" 
-F 0 "LED?" H 15155 7860 60  0000 R BNN
+AR Path="/57D8509E/5F17C1AC" Ref="LED5"  Part="1" 
+F 0 "LED5" H 15155 7860 60  0000 R BNN
 F 1 "LTST-C191KGKT" H 15155 7760 60  0000 R BNN
 F 2 "Cryptech_Alpha_Footprints:VD_0603" H 15155 7760 60  0001 C CNN
 F 3 "" H 15155 7760 60  0000 C CNN
@@ -1023,8 +925,8 @@ L Cryptech_Alpha:R-EU_R0402 R?
 U 1 1 5F17FA51
 P 15300 7450
 AR Path="/57D84C13/5F17FA51" Ref="R?"  Part="1" 
-AR Path="/57D8509E/5F17FA51" Ref="R?"  Part="1" 
-F 0 "R?" V 15240 7130 60  0000 L BNN
+AR Path="/57D8509E/5F17FA51" Ref="R48"  Part="1" 
+F 0 "R48" V 15240 7130 60  0000 L BNN
 F 1 "4.7k" V 15350 7130 60  0000 L BNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 15350 7130 60  0001 C CNN
 F 3 "" H 15350 7130 60  0000 C CNN
@@ -1032,10 +934,10 @@ F 3 "" H 15350 7130 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L Cryptech_Alpha:3V3_BATT #3V3_BATT_?
+L Cryptech_Alpha:3V3_BATT #3V3_BATT_0106
 U 1 1 5F17FFB4
 P 15300 7050
-F 0 "#3V3_BATT_?" H 15300 7050 20  0000 C CNN
+F 0 "#3V3_BATT_0106" H 15300 7050 20  0000 C CNN
 F 1 "+3V3_BATT" H 15300 6980 30  0000 C CNN
 F 2 "" H 15300 7050 70  0000 C CNN
 F 3 "" H 15300 7050 70  0000 C CNN
@@ -1047,10 +949,10 @@ Wire Wire Line
 Wire Wire Line
 	15300 7650 15300 7750
 $Comp
-L power:GND #GND_?
+L power:GND #GND_0245
 U 1 1 5F1879CF
 P 15300 8400
-F 0 "#GND_?" H 15300 8400 20  0000 C CNN
+F 0 "#GND_0245" H 15300 8400 20  0000 C CNN
 F 1 "+GND" H 15300 8330 30  0000 C CNN
 F 2 "" H 15300 8400 70  0000 C CNN
 F 3 "" H 15300 8400 70  0000 C CNN
@@ -1071,8 +973,8 @@ L Cryptech_Alpha:R-EU_R0402 R?
 U 1 1 5F1B0182
 P 13800 7450
 AR Path="/57D84FAD/5F1B0182" Ref="R?"  Part="1" 
-AR Path="/57D8509E/5F1B0182" Ref="R?"  Part="1" 
-F 0 "R?" V 13771 7797 60  0000 R TNN
+AR Path="/57D8509E/5F1B0182" Ref="R34"  Part="1" 
+F 0 "R34" V 13771 7797 60  0000 R TNN
 F 1 "10k" V 13660 7800 60  0000 R TNN
 F 2 "Cryptech_Alpha_Footprints:R_0402" H 13660 7800 60  0001 C CNN
 F 3 "" H 13660 7800 60  0000 C CNN
@@ -1080,10 +982,10 @@ F 3 "" H 13660 7800 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Cryptech_Alpha:3V3_BATT #3V3_BATT_?
+L Cryptech_Alpha:3V3_BATT #3V3_BATT_0107
 U 1 1 5F1B496A
 P 13800 7050
-F 0 "#3V3_BATT_?" H 13800 7050 20  0000 C CNN
+F 0 "#3V3_BATT_0107" H 13800 7050 20  0000 C CNN
 F 1 "+3V3_BATT" H 13800 6980 30  0000 C CNN
 F 2 "" H 13800 7050 70  0000 C CNN
 F 3 "" H 13800 7050 70  0000 C CNN
@@ -1098,4 +1000,108 @@ Wire Wire Line
 	13800 7750 13000 7750
 Text Label 13100 7750 0    50   ~ 0
 ICE40_CRESET
+Text Label 8300 8900 0    50   ~ 0
+ICE40_PANIC
+Text Notes 1600 4450 0    50   ~ 0
+iCE40 *_G pins are "global" I/Os (can be used\nas chip-wide reset, clock, etc). Panic button is\ndefinitely the first candidate for such pins.
+Connection ~ 7000 1350
+Wire Wire Line
+	7000 1350 7200 1350
+$Comp
+L Cryptech_Alpha:C-EUC0402 C222
+U 1 1 5F15426E
+P 7000 1650
+F 0 "C222" V 6900 1500 60  0000 R TNN
+F 1 "0.01uF" V 6900 1950 60  0000 R TNN
+F 2 "Cryptech_Alpha_Footprints:C_0402" H 6900 1750 60  0001 C CNN
+F 3 "" H 6900 1750 60  0000 C CNN
+	1    7000 1650
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	7200 1450 7200 1350
+Wire Wire Line
+	7000 1450 7000 1350
+Wire Wire Line
+	7000 1750 7000 1950
+Wire Wire Line
+	7200 1950 7200 1750
+$Comp
+L power:GND #GND_0238
+U 1 1 5F149FCC
+P 7200 1950
+F 0 "#GND_0238" H 7200 1950 20  0000 C CNN
+F 1 "+GND" H 7200 1880 30  0000 C CNN
+F 2 "" H 7200 1950 70  0000 C CNN
+F 3 "" H 7200 1950 70  0000 C CNN
+	1    7200 1950
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #GND_0236
+U 1 1 5F149FC2
+P 7000 1950
+F 0 "#GND_0236" H 7000 1950 20  0000 C CNN
+F 1 "+GND" H 7000 1880 30  0000 C CNN
+F 2 "" H 7000 1950 70  0000 C CNN
+F 3 "" H 7000 1950 70  0000 C CNN
+	1    7000 1950
+	1    0    0    -1  
+$EndComp
+$Comp
+L Cryptech_Alpha:C-EUC0402 C?
+U 1 1 5F149FB8
+P 7200 1550
+AR Path="/57D849FD/5F149FB8" Ref="C?"  Part="1" 
+AR Path="/57D8509E/5F149FB8" Ref="C224"  Part="1" 
+F 0 "C224" V 7300 1600 60  0000 L BNN
+F 1 "0.1uF" V 7300 1200 60  0000 L BNN
+F 2 "Cryptech_Alpha_Footprints:C_0402" H 7040 1660 60  0001 C CNN
+F 3 "" H 7040 1660 60  0000 C CNN
+	1    7200 1550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4700 1250 4700 1350
+Wire Wire Line
+	4700 1350 7000 1350
+Connection ~ 4700 1350
+Wire Wire Line
+	4700 1350 4700 1450
+Text GLabel 6000 1850 2    50   Output ~ 0
+ICE40_CDONE
+Wire Wire Line
+	9000 8700 8200 8700
+Wire Wire Line
+	9000 8800 8200 8800
+Wire Wire Line
+	9000 9000 8200 9000
+Wire Wire Line
+	9000 9100 8200 9100
+Wire Wire Line
+	9000 8900 8200 8900
+Text GLabel 3300 1850 0    50   Input ~ 0
+ICE40_CRESET
+Text Label 3400 1850 0    50   ~ 0
+ICE40_CRESET
+Wire Wire Line
+	4200 1850 3300 1850
+Text Label 8300 8700 0    50   ~ 0
+ICE40_LED1
+Text Label 8300 8800 0    50   ~ 0
+ICE40_LED2
+Text Label 8300 9000 0    50   ~ 0
+ICE40_LED3
+Text Label 8300 9100 0    50   ~ 0
+ICE40_LED4
+Text GLabel 8200 8700 0    50   Input ~ 0
+ICE40_LED1
+Text GLabel 8200 8800 0    50   Input ~ 0
+ICE40_LED2
+Text GLabel 8200 8900 0    50   Input ~ 0
+ICE40_PANIC
+Text GLabel 8200 9000 0    50   Input ~ 0
+ICE40_LED3
+Text GLabel 8200 9100 0    50   Input ~ 0
+ICE40_LED4
 $EndSCHEMATC