using corrected schem symbol, reordering pins

8 years ago · 19b884baef
parent a4b74230d3
commit 19b884baef
15 changed files with 2931 additions and 2668 deletions
--- a/blinkey.bak
+++ b/blinkey.bak
@ -322,9 +322,33 @@ $EndComp
 Wire Wire Line
 	4400 2550 4250 2550
 Wire Wire Line
-	2750 2700 2750 3950
+	2750 2700 2750 2950
 Wire Wire Line
-	4250 2550 4250 4100
+	2750 2950 2750 3150
+Wire Wire Line
+	2750 3150 2750 3350
+Wire Wire Line
+	2750 3350 2750 3550
+Wire Wire Line
+	2750 3550 2750 3750
+Wire Wire Line
+	2750 3750 2750 3950
+Wire Wire Line
+	4250 2550 4250 2750
+Wire Wire Line
+	4250 2750 4250 2950
+Wire Wire Line
+	4250 2950 4250 3150
+Wire Wire Line
+	4250 3150 4250 3350
+Wire Wire Line
+	4250 3350 4250 3550
+Wire Wire Line
+	4250 3550 4250 3750
+Wire Wire Line
+	4250 3750 4250 3950
+Wire Wire Line
+	4250 3950 4250 4100
 Wire Wire Line
 	4250 3950 4400 3950
 Wire Wire Line
--- a/gpdi.bak
+++ b/gpdi.bak
@ -426,35 +426,35 @@ Text GLabel 7000 2300 2    60   Input ~ 0
 GPDI_SDA
 Text GLabel 5500 2100 0    60   Input ~ 0
 GPDI_CEC
-Text GLabel 7000 3400 2    60   Input ~ 0
+Text GLabel 8650 3250 2    60   Input ~ 0
 LED0
-Text GLabel 7000 3600 2    60   Input ~ 0
+Text GLabel 8650 3550 2    60   Input ~ 0
 LED1
-Text GLabel 7000 2500 2    60   Input ~ 0
+Text GLabel 8650 2500 2    60   Input ~ 0
 LED2
-Text GLabel 7000 2700 2    60   Input ~ 0
+Text GLabel 8650 2650 2    60   Input ~ 0
 LED3
-Text GLabel 7000 2900 2    60   Input ~ 0
+Text GLabel 8650 2800 2    60   Input ~ 0
 LED4
-Text GLabel 7000 3100 2    60   Input ~ 0
+Text GLabel 8650 2950 2    60   Input ~ 0
 LED5
-Text GLabel 7000 3300 2    60   Input ~ 0
+Text GLabel 8650 3100 2    60   Input ~ 0
 LED6
-Text GLabel 7000 3500 2    60   Input ~ 0
+Text GLabel 8650 3400 2    60   Input ~ 0
 LED7
 Text GLabel 5500 3600 0    60   Input ~ 0
 BTN_U
-Text GLabel 5500 2300 0    60   Input ~ 0
+Text GLabel 3550 2800 0    60   Input ~ 0
 BTN_D
-Text GLabel 5500 2500 0    60   Input ~ 0
+Text GLabel 3550 2950 0    60   Input ~ 0
 BTN_L
-Text GLabel 5500 2700 0    60   Input ~ 0
+Text GLabel 3550 3100 0    60   Input ~ 0
 BTN_R
-Text GLabel 5500 2900 0    60   Input ~ 0
+Text GLabel 3550 3250 0    60   Input ~ 0
 BTN_F1
-Text GLabel 5500 3100 0    60   Input ~ 0
+Text GLabel 3550 3400 0    60   Input ~ 0
 BTN_F2
-Text GLabel 5500 3300 0    60   Input ~ 0
+Text GLabel 3550 3550 0    60   Input ~ 0
 BTN_PWRn
 $Comp
 L Crystal_GND24 Y1
@ -517,4 +517,32 @@ F 3 "" H 5200 3750 60  0000 C CNN
 	2    6250 2800
 	1    0    0    -1  
 $EndComp
+Text GLabel 5500 2700 0    60   Input ~ 0
+J2_25-
+Text GLabel 5500 2900 0    60   Input ~ 0
+J2_27-
+Text GLabel 5500 3400 0    60   Input ~ 0
+J2_29-
+Text GLabel 5500 2500 0    60   Input ~ 0
+J2_31-
+Text GLabel 5500 2800 0    60   Input ~ 0
+J2_33-
+Text GLabel 5500 3300 0    60   Input ~ 0
+J2_35-
+Text GLabel 7000 3300 2    60   Input ~ 0
+J2_35+
+Text GLabel 7000 3400 2    60   Input ~ 0
+J2_29+
+Text GLabel 7000 2900 2    60   Input ~ 0
+J2_27+
+Text GLabel 7000 2800 2    60   Input ~ 0
+J2_33+
+Text GLabel 7000 2700 2    60   Input ~ 0
+J2_25+
+Text GLabel 7000 2500 2    60   Input ~ 0
+J2_31+
+Text GLabel 5500 3100 0    60   Input ~ 0
+J2_23-
+Text GLabel 7000 3100 2    60   Input ~ 0
+J2_23+
 $EndSCHEMATC
--- a/gpdi.sch
+++ b/gpdi.sch
@ -426,35 +426,35 @@ Text GLabel 7000 2300 2    60   Input ~ 0
 GPDI_SDA
 Text GLabel 5500 2100 0    60   Input ~ 0
 GPDI_CEC
-Text GLabel 7000 3400 2    60   Input ~ 0
+Text GLabel 8650 3250 2    60   Input ~ 0
 LED0
-Text GLabel 7000 3600 2    60   Input ~ 0
+Text GLabel 8650 3550 2    60   Input ~ 0
 LED1
-Text GLabel 7000 2500 2    60   Input ~ 0
+Text GLabel 8650 2500 2    60   Input ~ 0
 LED2
-Text GLabel 7000 2700 2    60   Input ~ 0
+Text GLabel 8650 2650 2    60   Input ~ 0
 LED3
-Text GLabel 7000 2900 2    60   Input ~ 0
+Text GLabel 8650 2800 2    60   Input ~ 0
 LED4
-Text GLabel 7000 3100 2    60   Input ~ 0
+Text GLabel 8650 2950 2    60   Input ~ 0
 LED5
-Text GLabel 7000 3300 2    60   Input ~ 0
+Text GLabel 8650 3100 2    60   Input ~ 0
 LED6
-Text GLabel 7000 3500 2    60   Input ~ 0
+Text GLabel 8650 3400 2    60   Input ~ 0
 LED7
 Text GLabel 5500 3600 0    60   Input ~ 0
 BTN_U
-Text GLabel 5500 2300 0    60   Input ~ 0
+Text GLabel 3550 2800 0    60   Input ~ 0
 BTN_D
-Text GLabel 5500 2500 0    60   Input ~ 0
+Text GLabel 3550 2950 0    60   Input ~ 0
 BTN_L
-Text GLabel 5500 2700 0    60   Input ~ 0
+Text GLabel 3550 3100 0    60   Input ~ 0
 BTN_R
-Text GLabel 5500 2900 0    60   Input ~ 0
+Text GLabel 3550 3250 0    60   Input ~ 0
 BTN_F1
-Text GLabel 5500 3100 0    60   Input ~ 0
+Text GLabel 3550 3400 0    60   Input ~ 0
 BTN_F2
-Text GLabel 5500 3300 0    60   Input ~ 0
+Text GLabel 3550 3550 0    60   Input ~ 0
 BTN_PWRn
 $Comp
 L Crystal_GND24 Y1
@ -517,4 +517,32 @@ F 3 "" H 5200 3750 60  0000 C CNN
 	2    6250 2800
 	1    0    0    -1  
 $EndComp
+Text GLabel 5500 2700 0    60   Input ~ 0
+J2_25-
+Text GLabel 5500 2900 0    60   Input ~ 0
+J2_27-
+Text GLabel 5500 3400 0    60   Input ~ 0
+J2_29-
+Text GLabel 5500 2500 0    60   Input ~ 0
+J2_31-
+Text GLabel 5500 2800 0    60   Input ~ 0
+J2_33-
+Text GLabel 5500 3300 0    60   Input ~ 0
+J2_35-
+Text GLabel 7000 3300 2    60   Input ~ 0
+J2_35+
+Text GLabel 7000 3400 2    60   Input ~ 0
+J2_29+
+Text GLabel 7000 2900 2    60   Input ~ 0
+J2_27+
+Text GLabel 7000 2800 2    60   Input ~ 0
+J2_33+
+Text GLabel 7000 2700 2    60   Input ~ 0
+J2_25+
+Text GLabel 7000 2500 2    60   Input ~ 0
+J2_31+
+Text GLabel 5500 3100 0    60   Input ~ 0
+J2_23-
+Text GLabel 7000 3100 2    60   Input ~ 0
+J2_23+
 $EndSCHEMATC
--- a/gpio.bak
+++ b/gpio.bak
@ -536,25 +536,25 @@ Text GLabel 4150 4750 0    60   Input ~ 0
 J1_31-
 Text GLabel 5650 4750 2    60   Input ~ 0
 J1_31+
-Text GLabel 4150 4550 0    60   Input ~ 0
+Text GLabel 4150 4950 0    60   Input ~ 0
 J1_29-
-Text GLabel 5650 4550 2    60   Input ~ 0
+Text GLabel 5650 4950 2    60   Input ~ 0
 J1_29+
-Text GLabel 4200 2700 0    60   Input ~ 0
+Text GLabel 4200 2300 0    60   Input ~ 0
 J1_27-
-Text GLabel 5700 2700 2    60   Input ~ 0
+Text GLabel 5700 2300 2    60   Input ~ 0
 J1_27+
-Text GLabel 4200 2500 0    60   Input ~ 0
+Text GLabel 4150 4150 0    60   Input ~ 0
 J1_25-
-Text GLabel 5700 2500 2    60   Input ~ 0
+Text GLabel 5650 4150 2    60   Input ~ 0
 J1_25+
-Text GLabel 4200 2800 0    60   Input ~ 0
+Text GLabel 4150 4350 0    60   Input ~ 0
 J1_23-
-Text GLabel 5700 2800 2    60   Input ~ 0
+Text GLabel 5650 4350 2    60   Input ~ 0
 J1_23+
-Text GLabel 4200 2200 0    60   Input ~ 0
+Text GLabel 4200 2000 0    60   Input ~ 0
 J1_17-
-Text GLabel 5700 2200 2    60   Input ~ 0
+Text GLabel 5700 2000 2    60   Input ~ 0
 J1_17+
 $Comp
 L LFE5U-25F-6BG381C U1
@ -578,4 +578,44 @@ F 3 "" H 3850 5700 60  0000 C CNN
 	6    4900 4750
 	1    0    0    -1  
 $EndComp
+Text GLabel 4200 2900 0    60   Input ~ 0
+J1_5-
+Text GLabel 4200 2100 0    60   Input ~ 0
+J1_7-
+Text GLabel 4200 1800 0    60   Input ~ 0
+J1_9-
+Text GLabel 4200 2600 0    60   Input ~ 0
+J1_13-
+Text GLabel 5700 2900 2    60   Input ~ 0
+J1_5+
+Text GLabel 5700 2100 2    60   Input ~ 0
+J1_7+
+Text GLabel 5700 1800 2    60   Input ~ 0
+J1_9+
+Text GLabel 5700 2600 2    60   Input ~ 0
+J1_13+
+Text GLabel 5700 2400 2    60   Input ~ 0
+J1_15+
+Text GLabel 4200 2400 0    60   Input ~ 0
+J1_15-
+Text GLabel 4200 1900 0    60   Input ~ 0
+J1_11-
+Text GLabel 5700 1900 2    60   Input ~ 0
+J1_11+
+Text GLabel 4150 4050 0    60   Input ~ 0
+AUDIO_L0
+Text GLabel 4150 4250 0    60   Input ~ 0
+AUDIO_L1
+Text GLabel 4150 4450 0    60   Input ~ 0
+AUDIO_L2
+Text GLabel 4150 4650 0    60   Input ~ 0
+AUDIO_L3
+Text GLabel 5650 4050 2    60   Input ~ 0
+AUDIO_R0
+Text GLabel 5650 4250 2    60   Input ~ 0
+AUDIO_R1
+Text GLabel 5650 4450 2    60   Input ~ 0
+AUDIO_R2
+Text GLabel 5650 4650 2    60   Input ~ 0
+AUDIO_R3
 $EndSCHEMATC
--- a/gpio.sch
+++ b/gpio.sch
@ -536,25 +536,25 @@ Text GLabel 4150 4750 0    60   Input ~ 0
 J1_31-
 Text GLabel 5650 4750 2    60   Input ~ 0
 J1_31+
-Text GLabel 4150 4550 0    60   Input ~ 0
+Text GLabel 4150 4950 0    60   Input ~ 0
 J1_29-
-Text GLabel 5650 4550 2    60   Input ~ 0
+Text GLabel 5650 4950 2    60   Input ~ 0
 J1_29+
-Text GLabel 4200 2700 0    60   Input ~ 0
+Text GLabel 4200 2300 0    60   Input ~ 0
 J1_27-
-Text GLabel 5700 2700 2    60   Input ~ 0
+Text GLabel 5700 2300 2    60   Input ~ 0
 J1_27+
-Text GLabel 4200 2500 0    60   Input ~ 0
+Text GLabel 4150 4150 0    60   Input ~ 0
 J1_25-
-Text GLabel 5700 2500 2    60   Input ~ 0
+Text GLabel 5650 4150 2    60   Input ~ 0
 J1_25+
-Text GLabel 4200 2800 0    60   Input ~ 0
+Text GLabel 4150 4350 0    60   Input ~ 0
 J1_23-
-Text GLabel 5700 2800 2    60   Input ~ 0
+Text GLabel 5650 4350 2    60   Input ~ 0
 J1_23+
-Text GLabel 4200 2200 0    60   Input ~ 0
+Text GLabel 4200 2000 0    60   Input ~ 0
 J1_17-
-Text GLabel 5700 2200 2    60   Input ~ 0
+Text GLabel 5700 2000 2    60   Input ~ 0
 J1_17+
 $Comp
 L LFE5U-25F-6BG381C U1
@ -578,4 +578,44 @@ F 3 "" H 3850 5700 60  0000 C CNN
 	6    4900 4750
 	1    0    0    -1  
 $EndComp
+Text GLabel 4200 2900 0    60   Input ~ 0
+J1_5-
+Text GLabel 4200 2100 0    60   Input ~ 0
+J1_7-
+Text GLabel 4200 1800 0    60   Input ~ 0
+J1_9-
+Text GLabel 4200 2600 0    60   Input ~ 0
+J1_13-
+Text GLabel 5700 2900 2    60   Input ~ 0
+J1_5+
+Text GLabel 5700 2100 2    60   Input ~ 0
+J1_7+
+Text GLabel 5700 1800 2    60   Input ~ 0
+J1_9+
+Text GLabel 5700 2600 2    60   Input ~ 0
+J1_13+
+Text GLabel 5700 2400 2    60   Input ~ 0
+J1_15+
+Text GLabel 4200 2400 0    60   Input ~ 0
+J1_15-
+Text GLabel 4200 1900 0    60   Input ~ 0
+J1_11-
+Text GLabel 5700 1900 2    60   Input ~ 0
+J1_11+
+Text GLabel 4150 4050 0    60   Input ~ 0
+AUDIO_L0
+Text GLabel 4150 4250 0    60   Input ~ 0
+AUDIO_L1
+Text GLabel 4150 4450 0    60   Input ~ 0
+AUDIO_L2
+Text GLabel 4150 4650 0    60   Input ~ 0
+AUDIO_L3
+Text GLabel 5650 4050 2    60   Input ~ 0
+AUDIO_R0
+Text GLabel 5650 4250 2    60   Input ~ 0
+AUDIO_R1
+Text GLabel 5650 4450 2    60   Input ~ 0
+AUDIO_R2
+Text GLabel 5650 4650 2    60   Input ~ 0
+AUDIO_R3
 $EndSCHEMATC
--- a/ram.bak
+++ b/ram.bak
@ -233,9 +233,9 @@ Text GLabel 10050 2650 2    60   Input ~ 0
 SDRAM_D2
 Text GLabel 8550 2650 0    60   Input ~ 0
 SDRAM_D3
-Text GLabel 8550 3350 0    60   Input ~ 0
+Text GLabel 8550 3650 0    60   Input ~ 0
 SDRAM_D4
-Text GLabel 10050 3550 2    60   Input ~ 0
+Text GLabel 10050 3650 2    60   Input ~ 0
 SDRAM_D5
 Text GLabel 8550 5550 0    60   Input ~ 0
 SDRAM_D6
@ -295,28 +295,12 @@ Text GLabel 10050 2850 2    60   Input ~ 0
 SDRAM_DQM1
 Text GLabel 10050 4950 2    60   Input ~ 0
 SDRAM_nRAS
-Text GLabel 8550 4650 0    60   Input ~ 0
+Text GLabel 10050 4550 2    60   Input ~ 0
 SDRAM_nCAS
 Text GLabel 10050 4750 2    60   Input ~ 0
 SDRAM_nWE
 Text GLabel 8550 4750 0    60   Input ~ 0
 SDRAM_nCS
-Text GLabel 8550 5450 0    60   Input ~ 0
-SD_CMD
-Text GLabel 8550 5850 0    60   Input ~ 0
-SD_D0
-Text GLabel 8550 5350 0    60   Input ~ 0
-SD_CLK
-Text GLabel 8550 5650 0    60   Input ~ 0
-SD_D3
-Text GLabel 10050 5350 2    60   Input ~ 0
-SD_D1
-Text GLabel 10050 5450 2    60   Input ~ 0
-SD_D2
-Text GLabel 10050 5550 2    60   Input ~ 0
-SD_WP
-Text GLabel 10050 5650 2    60   Input ~ 0
-SD_CD
 $Comp
 L LFE5U-25F-6BG381C U1
 U 4 1 58EBA210
@ -339,4 +323,36 @@ F 3 "" H 8250 4100 60  0000 C CNN
 	3    9300 3150
 	1    0    0    -1  
 $EndComp
+Text GLabel 8550 4650 0    60   Input ~ 0
+J2_5-
+Text GLabel 8550 5650 0    60   Input ~ 0
+J2_7-
+Text GLabel 10050 5650 2    60   Input ~ 0
+J2_7+
+Text GLabel 10050 4650 2    60   Input ~ 0
+J2_5+
+Text GLabel 10050 5450 2    60   Input ~ 0
+J2_9+
+Text GLabel 8550 5450 0    60   Input ~ 0
+J2_9-
+Text GLabel 8550 3550 0    60   Input ~ 0
+J2_13-
+Text GLabel 8550 3750 0    60   Input ~ 0
+J2_15-
+Text GLabel 8550 3950 0    60   Input ~ 0
+J2_17-
+Text GLabel 10050 3550 2    60   Input ~ 0
+J2_13+
+Text GLabel 10050 3750 2    60   Input ~ 0
+J2_15+
+Text GLabel 10050 3950 2    60   Input ~ 0
+J2_17+
+Text GLabel 8550 3350 0    60   Input ~ 0
+J2_19-
+Text GLabel 10050 3350 2    60   Input ~ 0
+J2_19+
+Text GLabel 8550 5850 0    60   Input ~ 0
+J2_11-
+Text GLabel 10050 5850 2    60   Input ~ 0
+J2_11+
 $EndSCHEMATC
--- a/ram.sch
+++ b/ram.sch
@ -233,9 +233,9 @@ Text GLabel 10050 2650 2    60   Input ~ 0
 SDRAM_D2
 Text GLabel 8550 2650 0    60   Input ~ 0
 SDRAM_D3
-Text GLabel 8550 3350 0    60   Input ~ 0
+Text GLabel 8550 3650 0    60   Input ~ 0
 SDRAM_D4
-Text GLabel 10050 3550 2    60   Input ~ 0
+Text GLabel 10050 3650 2    60   Input ~ 0
 SDRAM_D5
 Text GLabel 8550 5550 0    60   Input ~ 0
 SDRAM_D6
@ -295,28 +295,12 @@ Text GLabel 10050 2850 2    60   Input ~ 0
 SDRAM_DQM1
 Text GLabel 10050 4950 2    60   Input ~ 0
 SDRAM_nRAS
-Text GLabel 8550 4650 0    60   Input ~ 0
+Text GLabel 10050 4550 2    60   Input ~ 0
 SDRAM_nCAS
 Text GLabel 10050 4750 2    60   Input ~ 0
 SDRAM_nWE
 Text GLabel 8550 4750 0    60   Input ~ 0
 SDRAM_nCS
-Text GLabel 8550 5450 0    60   Input ~ 0
-SD_CMD
-Text GLabel 8550 5850 0    60   Input ~ 0
-SD_D0
-Text GLabel 8550 5350 0    60   Input ~ 0
-SD_CLK
-Text GLabel 8550 5650 0    60   Input ~ 0
-SD_D3
-Text GLabel 10050 5350 2    60   Input ~ 0
-SD_D1
-Text GLabel 10050 5450 2    60   Input ~ 0
-SD_D2
-Text GLabel 10050 5550 2    60   Input ~ 0
-SD_WP
-Text GLabel 10050 5650 2    60   Input ~ 0
-SD_CD
 $Comp
 L LFE5U-25F-6BG381C U1
 U 4 1 58EBA210
@ -339,4 +323,36 @@ F 3 "" H 8250 4100 60  0000 C CNN
 	3    9300 3150
 	1    0    0    -1  
 $EndComp
+Text GLabel 8550 4650 0    60   Input ~ 0
+J2_5-
+Text GLabel 8550 5650 0    60   Input ~ 0
+J2_7-
+Text GLabel 10050 5650 2    60   Input ~ 0
+J2_7+
+Text GLabel 10050 4650 2    60   Input ~ 0
+J2_5+
+Text GLabel 10050 5450 2    60   Input ~ 0
+J2_9+
+Text GLabel 8550 5450 0    60   Input ~ 0
+J2_9-
+Text GLabel 8550 3550 0    60   Input ~ 0
+J2_13-
+Text GLabel 8550 3750 0    60   Input ~ 0
+J2_15-
+Text GLabel 8550 3950 0    60   Input ~ 0
+J2_17-
+Text GLabel 10050 3550 2    60   Input ~ 0
+J2_13+
+Text GLabel 10050 3750 2    60   Input ~ 0
+J2_15+
+Text GLabel 10050 3950 2    60   Input ~ 0
+J2_17+
+Text GLabel 8550 3350 0    60   Input ~ 0
+J2_19-
+Text GLabel 10050 3350 2    60   Input ~ 0
+J2_19+
+Text GLabel 8550 5850 0    60   Input ~ 0
+J2_11-
+Text GLabel 10050 5850 2    60   Input ~ 0
+J2_11+
 $EndSCHEMATC
--- a/sdcard.bak
+++ b/sdcard.bak
@ -141,9 +141,9 @@ F 3 "" H 1700 6250 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 Text GLabel 2300 5850 0    60   Input ~ 0
-SD_2
+SD_D2
 Text GLabel 2300 5950 0    60   Input ~ 0
-SD_3
+SD_D3
 Text GLabel 2300 6050 0    60   Input ~ 0
 SD_CMD
 Text GLabel 2300 6350 0    60   Input ~ 0
--- a/sdcard.sch
+++ b/sdcard.sch
@ -141,9 +141,9 @@ F 3 "" H 1700 6250 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 Text GLabel 2300 5850 0    60   Input ~ 0
-SD_2
+SD_D2
 Text GLabel 2300 5950 0    60   Input ~ 0
-SD_3
+SD_D3
 Text GLabel 2300 6050 0    60   Input ~ 0
 SD_CMD
 Text GLabel 2300 6350 0    60   Input ~ 0
--- a/ulx3s-cache.lib
+++ b/ulx3s-cache.lib
@ -1031,7 +1031,7 @@ T 0 0 50 60 0 10 0 JTAG Normal 0 C C
 T 0 0 -550 60 0 1 1 BANK0 Normal 0 C C
 S -550 800 550 -500 1 1 0 N
 S -250 250 250 -250 1 1 0 N
-S -200 200 -50 100 1 1 0 N
+S -200 200 0 100 1 1 0 N
 X PT4A A6 -750 -400 200 R 50 50 1 1 I
 X PT4B B6 750 -400 200 L 50 50 1 1 I
 X PT11A C6 -750 -100 200 R 50 50 1 1 I
@ -1058,7 +1058,7 @@ X PCLKT0_0 B11 -750 700 200 R 50 50 1 1 I
 X PCLKC0_0 C11 750 700 200 L 50 50 1 1 I
 S -550 800 550 -900 2 1 0 N
 S -250 250 250 -250 2 1 0 N
-S 50 200 200 100 2 1 0 N
+S 0 200 200 100 2 1 0 N
 X PT67B B20 750 700 200 L 50 50 2 1 I
 X PCLKT1_1 D11 -750 -800 200 R 50 50 2 1 I
 X PCLKC1_1 E11 750 -800 200 L 50 50 2 1 I
@ -1093,7 +1093,7 @@ X PT67A A19 -750 700 200 R 50 50 2 1 I
 X PT65B B19 750 600 200 L 50 50 2 1 I
 S -550 800 550 -900 3 1 0 N
 S -250 250 250 -250 3 1 0 N
-S 200 200 100 50 3 1 0 N
+S 200 200 100 0 3 1 0 N
 X PR14A C20 -750 0 200 R 50 50 3 1 I
 X VREF1_2 D20 -750 100 200 R 50 50 3 1 I
 X PR17A E20 -750 200 200 R 50 50 3 1 I
@ -1128,7 +1128,7 @@ X PCLKT2_1 J19 -750 600 200 R 50 50 3 1 I
 X PCLKC2_1 K19 750 600 200 L 50 50 3 1 I
 S -550 800 550 -900 4 1 0 N
 S -250 250 250 -250 4 1 0 N
-S 100 -50 200 -200 4 1 0 N
+S 100 0 200 -200 4 1 0 N
 X PCLKT3_1 L20 -750 -800 200 R 50 50 4 1 I
 X PCLKC3_1 M20 750 -800 200 L 50 50 4 1 I
 X PR38B N20 750 0 200 L 50 50 4 1 I
@ -1163,42 +1163,42 @@ X PR44A T19 -750 400 200 R 50 50 4 1 I
 X PR44C U19 -750 500 200 R 50 50 4 1 I
 S -550 800 550 -900 5 1 0 N
 S -250 250 250 -250 5 1 0 N
-S -200 -50 -100 -200 5 1 0 N
-X PL32C H1 -750 500 200 R 50 50 5 1 I
+S -200 0 -100 -200 5 1 0 N
+X PCLKC6_1 F1 750 600 200 L 50 50 5 1 I
+X PCLKC6_0 G1 750 700 200 L 50 50 5 1 I
+X PL32C H1 -750 300 200 R 50 50 5 1 I
 X PL32B J1 750 200 200 L 50 50 5 1 I
-X PL32B J1 750 400 200 L 50 50 5 1 I
-X PL32D K1 750 500 200 L 50 50 5 1 I
+X PL32D K1 750 300 200 L 50 50 5 1 I
 X PL44C L1 -750 -500 200 R 50 50 5 1 I
 X PL44B M1 750 -600 200 L 50 50 5 1 I
 X PL44D N1 750 -500 200 L 50 50 5 1 I
 X PL47A P1 -750 -800 200 R 50 50 5 1 I
+X PCLKT6_1 G2 -750 600 200 R 50 50 5 1 I
+X PCLKT6_0 H2 -750 700 200 R 50 50 5 1 I
 X PL32A K2 -750 200 200 R 50 50 5 1 I
-X PL32A K2 -750 400 200 R 50 50 5 1 I
 X PL41D L2 750 -300 200 L 50 50 5 1 I
 X PL44A N2 -750 -600 200 R 50 50 5 1 I
 X PL47B P2 750 -800 200 L 50 50 5 1 I
-X GR_PCLK6_1 J3 -750 700 200 R 50 50 5 1 I
-X PL29D K3 750 700 200 L 50 50 5 1 I
+X GR_PCLK6_1 J3 -750 500 200 R 50 50 5 1 I
+X PL29D K3 750 500 200 L 50 50 5 1 I
 X PL41C L3 -750 -300 200 R 50 50 5 1 I
 X PL41B M3 750 -400 200 L 50 50 5 1 I
 X PL41A N3 -750 -400 200 R 50 50 5 1 I
 X GPLL0T_IN P3 -750 -700 200 R 50 50 5 1 I
-X GR_PCLK6_0 J4 -750 600 200 R 50 50 5 1 I
+X GR_PCLK6_0 J4 -750 400 200 R 50 50 5 1 I
 X PL35A K4 -750 0 200 R 50 50 5 1 I
-X PL32C L4 -750 300 200 R 50 50 5 1 I
 X PL35C L4 -750 100 200 R 50 50 5 1 I
 X PL38A M4 -750 -200 200 R 50 50 5 1 I
 X PL38C N4 -750 -100 200 R 50 50 5 1 I
 X GPLL0C_IN P4 750 -700 200 L 50 50 5 1 I
-X PL29B J5 750 600 200 L 50 50 5 1 I
+X PL29B J5 750 400 200 L 50 50 5 1 I
 X VREF1_6 K5 750 0 200 L 50 50 5 1 I
 X PL35D L5 750 100 200 L 50 50 5 1 I
-X PL35D L5 750 300 200 L 50 50 5 1 I
 X PL38B N5 750 -200 200 L 50 50 5 1 I
 X PL38D P5 750 -100 200 L 50 50 5 1 I
 S -550 800 550 -900 6 1 0 N
 S -250 250 250 -250 6 1 0 N
-S -200 200 -100 50 6 1 0 N
+S -200 200 -100 0 6 1 0 N
 X PL14B B1 750 -200 200 L 50 50 6 1 I
 X PL17A C1 -750 -400 200 R 50 50 6 1 I
 X PL17B D1 750 -400 200 L 50 50 6 1 I
@ -1233,7 +1233,7 @@ X PL20B G5 750 -600 200 L 50 50 6 1 I
 X GR_PCLK7_0 H5 -750 -500 200 R 50 50 6 1 I
 S -550 800 550 -900 7 1 0 N
 S -250 250 250 -250 7 1 0 N
-S -200 -200 -50 -100 7 1 0 N
+S -200 -200 0 -100 7 1 0 N
 X D7 R1 -750 700 200 R 50 50 7 1 I
 X D6 T1 750 700 200 L 50 50 7 1 I
 X D5/MISO2 U1 -750 600 200 R 50 50 7 1 I
@ -1256,7 +1256,7 @@ X CFG_1 T4 -750 -500 200 R 50 50 7 1 I
 X CFG_0 U4 -750 -600 200 R 50 50 7 1 I
 S -550 800 550 -900 8 1 0 N
 S -250 250 250 -250 8 1 0 N
-S 200 -200 50 -100 8 1 0 N
+S 200 -200 0 -100 8 1 0 N
 T 0 0 150 60 0 9 1 POWER Normal 0 C C
 S -5100 450 5050 -500 9 1 0 N
 S -250 250 250 -250 9 1 0 N
--- a/ulx3s.bak
+++ b/ulx3s.bak
@ -128,19 +128,8 @@ $EndComp
 $Comp
 L CONN_01X01 H2
 U 1 1 58E6BACE
-P 3700 6350
-F 0 "H2" H 3700 6450 50  0000 C CNN
-F 1 "HOLE" V 3800 6350 50  0000 C CNN
-F 2 "Mounting_Holes:MountingHole_3.2mm_M3_ISO14580_Pad" H 3700 6350 50  0001 C CNN
-F 3 "" H 3700 6350 50  0000 C CNN
-	1    3700 6350
-	0    -1   -1   0   
-$EndComp
-$Comp
-L CONN_01X01 H3
-U 1 1 58E6BAEF
 P 4250 6350
-F 0 "H3" H 4250 6450 50  0000 C CNN
+F 0 "H2" H 4250 6450 50  0000 C CNN
 F 1 "HOLE" V 4350 6350 50  0000 C CNN
 F 2 "Mounting_Holes:MountingHole_3.2mm_M3_ISO14580_Pad" H 4250 6350 50  0001 C CNN
 F 3 "" H 4250 6350 50  0000 C CNN
@ -148,14 +137,25 @@ F 3 "" H 4250 6350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
+L CONN_01X01 H3
+U 1 1 58E6BAEF
+P 4250 5650
+F 0 "H3" H 4250 5750 50  0000 C CNN
+F 1 "HOLE" V 4350 5650 50  0000 C CNN
+F 2 "Mounting_Holes:MountingHole_3.2mm_M3_ISO14580_Pad" H 4250 5650 50  0001 C CNN
+F 3 "" H 4250 5650 50  0000 C CNN
+	1    4250 5650
+	0    -1   -1   0   
+$EndComp
+$Comp
 L CONN_01X01 H4
 U 1 1 58E6BBE9
-P 4800 6350
-F 0 "H4" H 4800 6450 50  0000 C CNN
-F 1 "HOLE" V 4900 6350 50  0000 C CNN
-F 2 "Mounting_Holes:MountingHole_3.2mm_M3_ISO14580_Pad" H 4800 6350 50  0001 C CNN
-F 3 "" H 4800 6350 50  0000 C CNN
-	1    4800 6350
+P 3150 5600
+F 0 "H4" H 3150 5700 50  0000 C CNN
+F 1 "HOLE" V 3250 5600 50  0000 C CNN
+F 2 "Mounting_Holes:MountingHole_3.2mm_M3_ISO14580_Pad" H 3150 5600 50  0001 C CNN
+F 3 "" H 3150 5600 50  0000 C CNN
+	1    3150 5600
 	0    -1   -1   0   
 $EndComp
 $Comp
@ -172,19 +172,8 @@ $EndComp
 $Comp
 L GND #PWR02
 U 1 1 58E6BC2E
-P 3700 6550
-F 0 "#PWR02" H 3700 6300 50  0001 C CNN
-F 1 "GND" H 3700 6400 50  0000 C CNN
-F 2 "" H 3700 6550 50  0000 C CNN
-F 3 "" H 3700 6550 50  0000 C CNN
-	1    3700 6550
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR03
-U 1 1 58E6BC56
 P 4250 6550
-F 0 "#PWR03" H 4250 6300 50  0001 C CNN
+F 0 "#PWR02" H 4250 6300 50  0001 C CNN
 F 1 "GND" H 4250 6400 50  0000 C CNN
 F 2 "" H 4250 6550 50  0000 C CNN
 F 3 "" H 4250 6550 50  0000 C CNN
@ -192,14 +181,33 @@ F 3 "" H 4250 6550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
+L GND #PWR03
+U 1 1 58E6BC56
+P 4250 5850
+F 0 "#PWR03" H 4250 5600 50  0001 C CNN
+F 1 "GND" H 4250 5700 50  0000 C CNN
+F 2 "" H 4250 5850 50  0000 C CNN
+F 3 "" H 4250 5850 50  0000 C CNN
+	1    4250 5850
+	1    0    0    -1  
+$EndComp
+$Comp
 L GND #PWR04
 U 1 1 58E6BC72
-P 4800 6550
-F 0 "#PWR04" H 4800 6300 50  0001 C CNN
-F 1 "GND" H 4800 6400 50  0000 C CNN
-F 2 "" H 4800 6550 50  0000 C CNN
-F 3 "" H 4800 6550 50  0000 C CNN
-	1    4800 6550
+P 3150 5800
+F 0 "#PWR04" H 3150 5550 50  0001 C CNN
+F 1 "GND" H 3150 5650 50  0000 C CNN
+F 2 "" H 3150 5800 50  0000 C CNN
+F 3 "" H 3150 5800 50  0000 C CNN
+	1    3150 5800
 	1    0    0    -1  
 $EndComp
+Wire Notes Line
+	2950 5400 2950 6850
+Wire Notes Line
+	2950 6850 4450 6850
+Wire Notes Line
+	4450 6850 4450 5400
+Wire Notes Line
+	4450 5400 2950 5400
 $EndSCHEMATC
--- a/ulx3s.kicad_pcb
+++ b/ulx3s.kicad_pcb
--- a/ulx3s.kicad_pcb-bak
+++ b/ulx3s.kicad_pcb-bak
--- a/usb.bak
+++ b/usb.bak
@ -379,11 +379,11 @@ Text GLabel 10150 1650 2    60   Input ~ 0
 FTDI_nCTS
 Text GLabel 10150 1750 2    60   Input ~ 0
 FTDI_nDTR
-Text GLabel 10150 1950 2    60   Input ~ 0
+Text GLabel 10150 2350 2    60   Input ~ 0
 FTDI_nDCD
-Text GLabel 10150 1850 2    60   Input ~ 0
+Text GLabel 10150 1950 2    60   Input ~ 0
 FTDI_nDSR
-Text GLabel 10150 2050 2    60   Input ~ 0
+Text GLabel 10150 2150 2    60   Input ~ 0
 FTDI_nRI
 Text GLabel 8650 1350 0    60   Input ~ 0
 WIFI_TXD
@ -395,33 +395,17 @@ Text GLabel 8650 1650 0    60   Input ~ 0
 WIFI_GPIO2
 Text GLabel 8650 1750 0    60   Input ~ 0
 WIFI_GPIO15
-Text GLabel 8650 1850 0    60   Input ~ 0
+Text GLabel 8650 1950 0    60   Input ~ 0
 WIFI_EN
-Text GLabel 8650 2550 0    60   Input ~ 0
-AUDIO_L0
-Text GLabel 8650 2650 0    60   Input ~ 0
-AUDIO_L1
-Text GLabel 8650 2750 0    60   Input ~ 0
-AUDIO_L2
-Text GLabel 8650 2850 0    60   Input ~ 0
-AUDIO_L3
-Text GLabel 10150 2550 2    60   Input ~ 0
-AUDIO_R0
-Text GLabel 10150 2650 2    60   Input ~ 0
-AUDIO_R1
-Text GLabel 10150 2750 2    60   Input ~ 0
-AUDIO_R2
-Text GLabel 10150 2850 2    60   Input ~ 0
-AUDIO_R3
-Text GLabel 8650 2150 0    60   Input ~ 0
-OLED_RES
 Text GLabel 8650 2050 0    60   Input ~ 0
+OLED_RES
+Text GLabel 8650 1850 0    60   Input ~ 0
 OLED_MOSI
-Text GLabel 8650 1950 0    60   Input ~ 0
+Text GLabel 10150 1850 2    60   Input ~ 0
 OLED_CLK
-Text GLabel 8650 2250 0    60   Input ~ 0
+Text GLabel 10150 2050 2    60   Input ~ 0
 OLED_DC
-Text GLabel 8650 2350 0    60   Input ~ 0
+Text GLabel 8650 2150 0    60   Input ~ 0
 OLED_CS
 Text GLabel 10150 2450 2    60   Input ~ 0
 USB_FPGA_D-
@ -438,4 +422,20 @@ F 3 "" H 8350 3000 60  0000 C CNN
 	5    9400 2050
 	1    0    0    -1  
 $EndComp
+Text GLabel 8650 2550 0    60   Input ~ 0
+SD_D0
+Text GLabel 8650 2650 0    60   Input ~ 0
+SD_D1
+Text GLabel 8650 2750 0    60   Input ~ 0
+SD_D2
+Text GLabel 8650 2850 0    60   Input ~ 0
+SD_D3
+Text GLabel 10150 2550 2    60   Input ~ 0
+SD_CLK
+Text GLabel 10150 2650 2    60   Input ~ 0
+SD_CMD
+Text GLabel 10150 2750 2    60   Input ~ 0
+SD_WP
+Text GLabel 10150 2850 2    60   Input ~ 0
+SD_CD
 $EndSCHEMATC
--- a/usb.sch
+++ b/usb.sch
@ -379,11 +379,11 @@ Text GLabel 10150 1650 2    60   Input ~ 0
 FTDI_nCTS
 Text GLabel 10150 1750 2    60   Input ~ 0
 FTDI_nDTR
-Text GLabel 10150 1950 2    60   Input ~ 0
+Text GLabel 10150 2350 2    60   Input ~ 0
 FTDI_nDCD
-Text GLabel 10150 1850 2    60   Input ~ 0
+Text GLabel 10150 1950 2    60   Input ~ 0
 FTDI_nDSR
-Text GLabel 10150 2050 2    60   Input ~ 0
+Text GLabel 10150 2150 2    60   Input ~ 0
 FTDI_nRI
 Text GLabel 8650 1350 0    60   Input ~ 0
 WIFI_TXD
@ -395,33 +395,17 @@ Text GLabel 8650 1650 0    60   Input ~ 0
 WIFI_GPIO2
 Text GLabel 8650 1750 0    60   Input ~ 0
 WIFI_GPIO15
-Text GLabel 8650 1850 0    60   Input ~ 0
+Text GLabel 8650 1950 0    60   Input ~ 0
 WIFI_EN
-Text GLabel 8650 2550 0    60   Input ~ 0
-AUDIO_L0
-Text GLabel 8650 2650 0    60   Input ~ 0
-AUDIO_L1
-Text GLabel 8650 2750 0    60   Input ~ 0
-AUDIO_L2
-Text GLabel 8650 2850 0    60   Input ~ 0
-AUDIO_L3
-Text GLabel 10150 2550 2    60   Input ~ 0
-AUDIO_R0
-Text GLabel 10150 2650 2    60   Input ~ 0
-AUDIO_R1
-Text GLabel 10150 2750 2    60   Input ~ 0
-AUDIO_R2
-Text GLabel 10150 2850 2    60   Input ~ 0
-AUDIO_R3
-Text GLabel 8650 2150 0    60   Input ~ 0
-OLED_RES
 Text GLabel 8650 2050 0    60   Input ~ 0
+OLED_RES
+Text GLabel 8650 1850 0    60   Input ~ 0
 OLED_MOSI
-Text GLabel 8650 1950 0    60   Input ~ 0
+Text GLabel 10150 1850 2    60   Input ~ 0
 OLED_CLK
-Text GLabel 8650 2250 0    60   Input ~ 0
+Text GLabel 10150 2050 2    60   Input ~ 0
 OLED_DC
-Text GLabel 8650 2350 0    60   Input ~ 0
+Text GLabel 8650 2150 0    60   Input ~ 0
 OLED_CS
 Text GLabel 10150 2450 2    60   Input ~ 0
 USB_FPGA_D-
@ -438,4 +422,20 @@ F 3 "" H 8350 3000 60  0000 C CNN
 	5    9400 2050
 	1    0    0    -1  
 $EndComp
+Text GLabel 8650 2550 0    60   Input ~ 0
+SD_D0
+Text GLabel 8650 2650 0    60   Input ~ 0
+SD_D1
+Text GLabel 8650 2750 0    60   Input ~ 0
+SD_D2
+Text GLabel 8650 2850 0    60   Input ~ 0
+SD_D3
+Text GLabel 10150 2550 2    60   Input ~ 0
+SD_CLK
+Text GLabel 10150 2650 2    60   Input ~ 0
+SD_CMD
+Text GLabel 10150 2750 2    60   Input ~ 0
+SD_WP
+Text GLabel 10150 2850 2    60   Input ~ 0
+SD_CD
 $EndSCHEMATC