new attempt with updated upstream tool (still a lot of local changes)

1 files changed, 193 insertions, 193 deletions

diff --git a/rev03-KiCad/rev02_12.sch b/rev03-KiCad/rev02_12.sch
index fa07462..af80205 100644
--- a/rev03-KiCad/rev02_12.sch
+++ b/rev03-KiCad/rev02_12.sch
@@ -42,399 +42,399 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Notes 13970 5060 0    42   ~ 12
+Text Notes 12700 5600 0    42   ~ 12
 CS pull-up to disable MKM by\ndefault (allows programming\nof AVR)
-Text Notes 12540 3080 0    84   ~ 12
+Text Notes 11400 3800 0    84   ~ 12
 Master Key Memory
-Text Notes 3740 1870 0    84   ~ 12
+Text Notes 3400 2700 0    84   ~ 12
 SPI mux controlling access to the MKM.\nNormally, the FPGA has R/W access to the MKM but on a\ntamper event the tamper detect MCU (AVR) will grab access\nto the MKM and erase the contents.
-Text Notes 8580 5610 0    42   ~ 12
+Text Notes 7800 6100 0    42   ~ 12
 Make AVR unable to read the\nMKM by installing this jumper
-Text Notes 4290 5390 0    42   ~ 12
+Text Notes 3900 5900 0    42   ~ 12
 AVR access default\ndisabled through pull-up
-Text Notes 4180 6600 0    42   ~ 12
+Text Notes 3800 7000 0    42   ~ 12
 FPGA access default\nenabled through pull-down
-Text Notes 14993 10153 0    84   ~ 12
+Text Notes 13630 10230 0    84   ~ 12
 Master Key Memory
-Text Notes 13079 4334 0    60   ~ 12
+Text Notes 11890 4940 0    60   ~ 12
 U12
-Text Notes 12936 6094 0    60   ~ 12
+Text Notes 11760 6540 0    60   ~ 12
 23K640-I/SN
-Text Label 11594 4213 0 70 ~
+Text Label 10540 4830 0 70 ~
 4.7k
-Text Label 10714 4224 0 70 ~
+Text Label 9740 4840 0 70 ~
 4.7k
-Text Label 2739 4290 0 70 ~
+Text Label 2490 4900 0 70 ~
 0.1uF
-Text Label 12760 3740 0 70 ~
+Text Label 11600 4400 0 70 ~
 0.1uF
-Text Notes 8250 5720 1    60   ~ 12
+Text Notes 7500 6200 1    60   ~ 12
 JP6
-Text Notes 5632 4092 0    60   ~ 12
+Text Notes 5120 4720 0    60   ~ 12
 R80
-Text Label 5621 4191 0 70 ~
+Text Label 5110 4810 0 70 ~
 4.7k
-Text Notes 5797 6677 2    60   ~ 12
+Text Notes 5270 7070 2    60   ~ 12
 R81
-Text Label 5621 6886 0 70 ~
+Text Label 5110 7260 0 70 ~
 4.7k
-Text Notes 6050 4488 0    60   ~ 12
+Text Notes 5500 5080 0    60   ~ 12
 IC4
 $Comp
 L GND #PWR?58023F8C
 U 1 1 58023F8C
-P 12430 6050
-F 0 "GND_87" H 12430 6050 20  0000 C CNN
-F 1 "+GND" H 12430 5980 30  0000 C CNN
-F 2 "" H 12430 6050 70  0000 C CNN
-F 3 "" H 12430 6050 70  0000 C CNN
-	1    12430 6050
+P 11300 6500
+F 0 "GND_87" H 11300 6500 20  0000 C CNN
+F 1 "+GND" H 11300 6430 30  0000 C CNN
+F 2 "" H 11300 6500 70  0000 C CNN
+F 3 "" H 11300 6500 70  0000 C CNN
+	1    11300 6500
 	1    0    0    -1  
 $EndComp
 $Comp
 L 3V3_BATT #PWR?58023F8B
 U 1 1 58023F8B
-P 12430 3520
-F 0 "3V3_BATT_8" H 12430 3520 20  0000 C CNN
-F 1 "+3V3_BATT" H 12430 3450 30  0000 C CNN
-F 2 "" H 12430 3520 70  0000 C CNN
-F 3 "" H 12430 3520 70  0000 C CNN
-	1    12430 3520
+P 11300 4200
+F 0 "3V3_BATT_8" H 11300 4200 20  0000 C CNN
+F 1 "+3V3_BATT" H 11300 4130 30  0000 C CNN
+F 2 "" H 11300 4200 70  0000 C CNN
+F 3 "" H 11300 4200 70  0000 C CNN
+	1    11300 4200
 	1    0    0    -1  
 $EndComp
 $Comp
 L 3V3_BATT #PWR?58023F8A
 U 1 1 58023F8A
-P 3630 3410
-F 0 "3V3_BATT_9" H 3630 3410 20  0000 C CNN
-F 1 "+3V3_BATT" H 3630 3340 30  0000 C CNN
-F 2 "" H 3630 3410 70  0000 C CNN
-F 3 "" H 3630 3410 70  0000 C CNN
-	1    3630 3410
+P 3300 4100
+F 0 "3V3_BATT_9" H 3300 4100 20  0000 C CNN
+F 1 "+3V3_BATT" H 3300 4030 30  0000 C CNN
+F 2 "" H 3300 4100 70  0000 C CNN
+F 3 "" H 3300 4100 70  0000 C CNN
+	1    3300 4100
 	1    0    0    -1  
 $EndComp
 $Comp
 L 3V3_BATT #PWR?58023F89
 U 1 1 58023F89
-P 11880 3520
-F 0 "3V3_BATT_10" H 11880 3520 20  0000 C CNN
-F 1 "+3V3_BATT" H 11880 3450 30  0000 C CNN
-F 2 "" H 11880 3520 70  0000 C CNN
-F 3 "" H 11880 3520 70  0000 C CNN
-	1    11880 3520
+P 10800 4200
+F 0 "3V3_BATT_10" H 10800 4200 20  0000 C CNN
+F 1 "+3V3_BATT" H 10800 4130 30  0000 C CNN
+F 2 "" H 10800 4200 70  0000 C CNN
+F 3 "" H 10800 4200 70  0000 C CNN
+	1    10800 4200
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?58023F88
 U 1 1 58023F88
-P 12650 4070
-F 0 "GND_88" H 12650 4070 20  0000 C CNN
-F 1 "+GND" H 12650 4000 30  0000 C CNN
-F 2 "" H 12650 4070 70  0000 C CNN
-F 3 "" H 12650 4070 70  0000 C CNN
-	1    12650 4070
+P 11500 4700
+F 0 "GND_88" H 11500 4700 20  0000 C CNN
+F 1 "+GND" H 11500 4630 30  0000 C CNN
+F 2 "" H 11500 4700 70  0000 C CNN
+F 3 "" H 11500 4700 70  0000 C CNN
+	1    11500 4700
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?58023F87
 U 1 1 58023F87
-P 8360 5940
-F 0 "GND_89" H 8360 5940 20  0000 C CNN
-F 1 "+GND" H 8360 5870 30  0000 C CNN
-F 2 "" H 8360 5940 70  0000 C CNN
-F 3 "" H 8360 5940 70  0000 C CNN
-	1    8360 5940
+P 7600 6400
+F 0 "GND_89" H 7600 6400 20  0000 C CNN
+F 1 "+GND" H 7600 6330 30  0000 C CNN
+F 2 "" H 7600 6400 70  0000 C CNN
+F 3 "" H 7600 6400 70  0000 C CNN
+	1    7600 6400
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?58023F86
 U 1 1 58023F86
-P 3630 4620
-F 0 "GND_90" H 3630 4620 20  0000 C CNN
-F 1 "+GND" H 3630 4550 30  0000 C CNN
-F 2 "" H 3630 4620 70  0000 C CNN
-F 3 "" H 3630 4620 70  0000 C CNN
-	1    3630 4620
+P 3300 5200
+F 0 "GND_90" H 3300 5200 20  0000 C CNN
+F 1 "+GND" H 3300 5130 30  0000 C CNN
+F 2 "" H 3300 5200 70  0000 C CNN
+F 3 "" H 3300 5200 70  0000 C CNN
+	1    3300 5200
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR?58023F85
 U 1 1 58023F85
-P 5500 7150
-F 0 "GND_91" H 5500 7150 20  0000 C CNN
-F 1 "+GND" H 5500 7080 30  0000 C CNN
-F 2 "" H 5500 7150 70  0000 C CNN
-F 3 "" H 5500 7150 70  0000 C CNN
-	1    5500 7150
+P 5000 7500
+F 0 "GND_91" H 5000 7500 20  0000 C CNN
+F 1 "+GND" H 5000 7430 30  0000 C CNN
+F 2 "" H 5000 7500 70  0000 C CNN
+F 3 "" H 5000 7500 70  0000 C CNN
+	1    5000 7500
 	1    0    0    -1  
 $EndComp
 $Comp
 L 3V3_BATT #PWR?58023F84
 U 1 1 58023F84
-P 5500 3410
-F 0 "3V3_BATT_11" H 5500 3410 20  0000 C CNN
-F 1 "+3V3_BATT" H 5500 3340 30  0000 C CNN
-F 2 "" H 5500 3410 70  0000 C CNN
-F 3 "" H 5500 3410 70  0000 C CNN
-	1    5500 3410
+P 5000 4100
+F 0 "3V3_BATT_11" H 5000 4100 20  0000 C CNN
+F 1 "+3V3_BATT" H 5000 4030 30  0000 C CNN
+F 2 "" H 5000 4100 70  0000 C CNN
+F 3 "" H 5000 4100 70  0000 C CNN
+	1    5000 4100
 	1    0    0    -1  
 $EndComp
 $Comp
 L 3V3_BATT #PWR?58023F83
 U 1 1 58023F83
-P 11110 3542
-F 0 "3V3_BATT_12" H 11110 3542 20  0000 C CNN
-F 1 "+3V3_BATT" H 11110 3472 30  0000 C CNN
-F 2 "" H 11110 3542 70  0000 C CNN
-F 3 "" H 11110 3542 70  0000 C CNN
-	1    11110 3542
+P 10100 4220
+F 0 "3V3_BATT_12" H 10100 4220 20  0000 C CNN
+F 1 "+3V3_BATT" H 10100 4150 30  0000 C CNN
+F 2 "" H 10100 4220 70  0000 C CNN
+F 3 "" H 10100 4220 70  0000 C CNN
+	1    10100 4220
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	12430 5610 12430 6050
+	11300 6100 11300 6500
 Wire Wire Line
-	12540 5610 12430 5610
+	11400 6100 11300 6100
 Wire Wire Line
-	12650 3960 12650 4070
+	11500 4600 11500 4700
 Wire Wire Line
-	8360 5830 8360 5940
+	7600 6300 7600 6400
 Wire Wire Line
-	3630 4510 3630 4620
+	3300 5100 3300 5200
 Wire Wire Line
-	3630 4400 3630 4510
+	3300 5000 3300 5100
 Wire Wire Line
-	3190 4290 3190 4510
+	2900 4900 2900 5100
 Wire Wire Line
-	3630 4510 3190 4510
+	3300 5100 2900 5100
 Wire Wire Line
-	5500 7040 5500 7150
+	5000 7400 5000 7500
 Wire Wire Line
-	12540 5170 11880 5170
+	11400 5700 10800 5700
 Wire Wire Line
-	11880 4400 11880 5170
+	10800 5000 10800 5700
 Wire Wire Line
-	12540 5060 11110 5060
-Text Label 11110 5060 0 70 ~
+	11400 5600 10100 5600
+Text Label 10100 5600 0 70 ~
 MKM_SCK
 Wire Wire Line
-	7150 4730 6930 4730
+	6500 5300 6300 5300
 Wire Wire Line
-	7150 4730 7150 5940
+	6500 5300 6500 6400
 Wire Wire Line
-	7150 5940 6930 5940
+	6500 6400 6300 6400
 Wire Wire Line
-	7700 4730 7150 4730
-Text Label 7700 4730 0 70 ~
+	7000 5300 6500 5300
+Text Label 7000 5300 0 70 ~
 MKM_SCK
 Wire Wire Line
-	12540 4950 11110 4950
-Text Label 11110 4950 0 70 ~
+	11400 5500 10100 5500
+Text Label 10100 5500 0 70 ~
 MKM_MOSI
 Wire Wire Line
-	7260 6050 6930 6050
+	6600 6500 6300 6500
 Wire Wire Line
-	7260 4840 7260 6050
+	6600 5400 6600 6500
 Wire Wire Line
-	7260 4840 6930 4840
+	6600 5400 6300 5400
 Wire Wire Line
-	7700 4840 7260 4840
-Text Label 7700 4840 0 70 ~
+	7000 5400 6600 5400
+Text Label 7000 5400 0 70 ~
 MKM_MOSI
 Wire Wire Line
-	12540 4840 11550 4840
-Text Label 11154 4840 0 70 ~
+	11400 5400 10500 5400
+Text Label 10140 5400 0 70 ~
 MKM_CS_N
 Wire Wire Line
-	7040 5830 6930 5830
+	6400 6300 6300 6300
 Wire Wire Line
-	7040 4620 7040 5830
+	6400 5200 6400 6300
 Wire Wire Line
-	7040 4620 6930 4620
+	6400 5200 6300 5200
 Wire Wire Line
-	7700 4620 7040 4620
-Text Label 7700 4620 0 70 ~
+	7000 5200 6400 5200
+Text Label 7000 5200 0 70 ~
 MKM_CS_N
 Wire Wire Line
-	14465 4620 14080 4620
-Text Label 14080 4620 0 70 ~
+	13150 5200 12800 5200
+Text Label 12800 5200 0 70 ~
 MKM_MISO
 Wire Wire Line
-	5830 6160 5720 6160
+	5300 6600 5200 6600
 Wire Wire Line
-	5720 4950 5720 6160
+	5200 5500 5200 6600
 Wire Wire Line
-	5830 4950 5720 4950
+	5300 5500 5200 5500
 Wire Wire Line
-	5720 4950 5280 4950
-Text Label 5280 4950 0 70 ~
+	5200 5500 4800 5500
+Text Label 4800 5500 0 70 ~
 MKM_MISO
 Wire Wire Line
-	12540 4620 12430 4620
+	11400 5200 11300 5200
 Wire Wire Line
-	12430 3630 12430 4620
+	11300 4300 11300 5200
 Wire Wire Line
-	12430 3520 12430 3630
+	11300 4200 11300 4300
 Wire Wire Line
-	12650 3630 12430 3630
+	11500 4300 11300 4300
 Wire Wire Line
-	3630 3410 3630 3630
+	3300 4100 3300 4300
 Wire Wire Line
-	3630 3630 3190 3630
+	3300 4300 2900 4300
 Wire Wire Line
-	3190 3630 3190 3960
+	2900 4300 2900 4600
 Wire Wire Line
-	3630 3630 3630 3740
+	3300 4300 3300 4400
 Wire Wire Line
-	11880 3520 11880 3960
+	10800 4200 10800 4600
 Wire Wire Line
-	5500 3410 5500 3960
+	5000 4100 5000 4600
 Wire Wire Line
-	11110 3542 11110 3982
+	10100 4220 10100 4620
 Wire Wire Line
-	5500 5170 5005 5170
+	5000 5700 4550 5700
 Wire Wire Line
-	5830 5170 5500 5170
+	5300 5700 5000 5700
 Wire Wire Line
-	5500 4400 5500 5170
-Text Label 5005 5170 0 70 ~
+	5000 5000 5000 5700
+Text Label 4550 5700 0 70 ~
 MKM_CONTROL_AVR_ENA
 Wire Wire Line
-	5830 4730 5280 4730
-Text Label 5280 4730 0 70 ~
+	5300 5300 4800 5300
+Text Label 4800 5300 0 70 ~
 MKM_AVR_SCK
 Wire Wire Line
-	5830 5830 5071 5830
-Text Label 5071 5830 0 70 ~
+	5300 6300 4610 6300
+Text Label 4610 6300 0 70 ~
 MKM_FPGA_CS_N
 Wire Wire Line
-	5830 4620 5280 4620
-Text Label 5280 4620 0 70 ~
+	5300 5200 4800 5200
+Text Label 4800 5200 0 70 ~
 MKM_AVR_CS_N
 Wire Wire Line
-	5830 6050 5071 6050
-Text Label 5071 6050 0 70 ~
+	5300 6500 4610 6500
+Text Label 4610 6500 0 70 ~
 MKM_FPGA_MOSI
 Wire Wire Line
-	5830 4840 5280 4840
-Text Label 5280 4840 0 70 ~
+	5300 5400 4800 5400
+Text Label 4800 5400 0 70 ~
 MKM_AVR_MOSI
 Wire Wire Line
-	7150 6160 6930 6160
-Text Label 7150 6160 0 70 ~
+	6500 6600 6300 6600
+Text Label 6500 6600 0 70 ~
 MKM_FPGA_MISO
 Wire Wire Line
-	8360 4950 6930 4950
+	7600 5500 6300 5500
 Wire Wire Line
-	8580 4950 8360 4950
+	7800 5500 7600 5500
 Wire Wire Line
-	8360 4950 8360 5170
-Text Label 8580 4950 0 70 ~
+	7600 5500 7600 5700
+Text Label 7800 5500 0 70 ~
 MKM_AVR_MISO
 Wire Wire Line
-	5830 5940 5071 5940
-Text Label 5071 5940 0 70 ~
+	5300 6400 4610 6400
+Text Label 4610 6400 0 70 ~
 MKM_FPGA_SCK
 Wire Wire Line
-	5830 6380 5500 6380
+	5300 6800 5000 6800
 Wire Wire Line
-	5500 6380 5500 6600
+	5000 6800 5000 7000
 Wire Wire Line
-	5500 6380 4928 6380
-Text Label 4928 6380 0 70 ~
+	5000 6800 4480 6800
+Text Label 4480 6800 0 70 ~
 MKM_CONTROL_FPGA_DIS
 Wire Wire Line
-	11110 4840 11110 4422
+	10100 5400 10100 5020
 Wire Wire Line
-	11550 4840 11110 4840
+	10500 5400 10100 5400
 $Comp
 L 23K640-I/SN IC199
 U 1 1 58023F82
-	1    13310 5060
+	1    12100 5600
 	1    0    0    -1
 $EndComp
 $Comp
 L 74*244DW_2 IC200
 U 1 1 58023F81
-F 1 "MC74AC244DW*" H 6061 6512 60  0000 L BNN
-F 2 "" H 6061 6512 60  0000 C CNN
-F 3 "" H 6061 6512 60  0000 C CNN
-	1    6380 6050
+F 1 "MC74AC244DW*" H 5510 6920 60  0000 L BNN
+F 2 "" H 5510 6920 60  0000 C CNN
+F 3 "" H 5510 6920 60  0000 C CNN
+	1    5800 6500
 	1    0    0    -1
 $EndComp
 $Comp
 L 74*244DW_3 IC201
 U 1 1 58023F80
-F 1 "MC74AC244DW*" H 3828 4048 60  0000 L BNN
-F 2 "" H 3828 4048 60  0000 C CNN
-F 3 "" H 3828 4048 60  0000 C CNN
-	1    3630 4070
+F 1 "MC74AC244DW*" H 3480 4680 60  0000 L BNN
+F 2 "" H 3480 4680 60  0000 C CNN
+F 3 "" H 3480 4680 60  0000 C CNN
+	1    3300 4700
 	1    0    0    -1
 $EndComp
 $Comp
 L R-EU_R0402 R33
 U 1 1 58023F7F
-F 0 "R33" V 11815.1 3905 60  0000 L BNN
-F 1 "" V 11924 3850 60  0000 L BNN
-F 2 "" H 11924 3850 60  0000 C CNN
-F 3 "" H 11924 3850 60  0000 C CNN
-	1    11880 4180
+F 0 "R33" V 10741 4550 60  0000 L BNN
+F 1 "" V 10840 4500 60  0000 L BNN
+F 2 "" H 10840 4500 60  0000 C CNN
+F 3 "" H 10840 4500 60  0000 C CNN
+	1    10800 4800
 	0    1    1    0
 $EndComp
 $Comp
 L R-EU_R0402 R34
 U 1 1 58023F7E
-F 0 "R34" V 11188.1 4584.78889 60  0000 R TNN
-F 1 "" V 11066 4642 60  0000 R TNN
-F 2 "" H 11066 4642 60  0000 C CNN
-F 3 "" H 11066 4642 60  0000 C CNN
-	1    11110 4202
+F 0 "R34" V 10171 5167.9899 60  0000 R TNN
+F 1 "" V 10060 5220 60  0000 R TNN
+F 2 "" H 10060 5220 60  0000 C CNN
+F 3 "" H 10060 5220 60  0000 C CNN
+	1    10100 4820
 	0    -1   -1   0
 $EndComp
 $Comp
 L C-EUC0402 C106
 U 1 1 58023F7D
-F 0 "C106" H 2750 3960 60  0000 L BNN
-F 1 "" H 2750 4070 60  0000 L BNN
-F 2 "" H 2750 4070 60  0000 C CNN
-F 3 "" H 2750 4070 60  0000 C CNN
-	1    3190 4070
+F 0 "C106" H 2500 4600 60  0000 L BNN
+F 1 "" H 2500 4700 60  0000 L BNN
+F 2 "" H 2500 4700 60  0000 C CNN
+F 3 "" H 2500 4700 60  0000 C CNN
+	1    2900 4700
 	1    0    0    -1
 $EndComp
 $Comp
 L C-EUC0402 C107
 U 1 1 58023F7C
-F 0 "C107" H 12760 3850 60  0000 L BNN
-F 1 "" H 12760 3740 60  0000 L BNN
-F 2 "" H 12760 3740 60  0000 C CNN
-F 3 "" H 12760 3740 60  0000 C CNN
-	1    12650 3740
+F 0 "C107" H 11600 4500 60  0000 L BNN
+F 1 "" H 11600 4400 60  0000 L BNN
+F 2 "" H 11600 4400 60  0000 C CNN
+F 3 "" H 11600 4400 60  0000 C CNN
+	1    11500 4400
 	1    0    0    -1
 $EndComp
 $Comp
 L JP1Q IC206
 U 1 1 58023F7B
-	1    8360 5500
+	1    7600 6000
 	1    0    0    -1
 $EndComp
 $Comp
 L R-EU_R0402 IC207
 U 1 1 58023F7A
-	1    5500 4180
+	1    5000 4800
 	0    -1   -1   0
 $EndComp
 $Comp
 L R-EU_R0402 IC208
 U 1 1 58023F79
-	1    5500 6820
+	1    5000 7200
 	0    1    1    0
 $EndComp
 $Comp
 L 74*244DW_1 IC209
 U 1 1 58023F78
-F 1 "MC74AC244DW*" H 6050 5302 60  0000 L BNN
-F 2 "" H 6050 5302 60  0000 C CNN
-F 3 "" H 6050 5302 60  0000 C CNN
-	1    6380 4840
+F 1 "MC74AC244DW*" H 5500 5820 60  0000 L BNN
+F 2 "" H 5500 5820 60  0000 C CNN
+F 3 "" H 5500 5820 60  0000 C CNN
+	1    5800 5400
 	1    0    0    -1
 $EndComp
 $EndSCHEMATC
\ No newline at end of file