From c9516d1ebbadd174899b47201bc20a679dfce01f Mon Sep 17 00:00:00 2001
From: Sylvain Munaut <tnt@246tNt.com>
Date: Mon, 5 Sep 2022 11:14:39 +0200
Subject: [PATCH] gateware: Pin definition for proto and final board

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
---
 gateware/data/top-ice40-usbtrace-proto.pcf | 33 +++++++++++++++++++
 gateware/data/top-ice40-usbtrace.pcf       | 37 ++++++----------------
 2 files changed, 42 insertions(+), 28 deletions(-)
 create mode 100644 gateware/data/top-ice40-usbtrace-proto.pcf

diff --git a/gateware/data/top-ice40-usbtrace-proto.pcf b/gateware/data/top-ice40-usbtrace-proto.pcf
new file mode 100644
index 0000000..7404bba
--- /dev/null
+++ b/gateware/data/top-ice40-usbtrace-proto.pcf
@@ -0,0 +1,33 @@
+# USP tap
+set_io -nowarn             tap_dp      3
+set_io -nowarn             tap_dn      4
+
+# USB
+set_io -nowarn             usb_dp      42
+set_io -nowarn             usb_dn      38
+set_io -nowarn             usb_pu      37
+
+# Flash & PSRAM
+set_io -nowarn             spi_sck     15
+set_io -nowarn             spi_io[0]   14
+set_io -nowarn             spi_io[1]   17
+set_io -nowarn             spi_io[2]   18
+set_io -nowarn             spi_io[3]   19
+set_io -nowarn -pullup yes spi_cs_n[0] 16
+set_io -nowarn -pullup yes spi_cs_n[1]  6
+
+# UART
+set_io -nowarn -pullup yes uart_rx     47
+set_io -nowarn             uart_tx     44
+
+# Clock
+set_io -nowarn             clk_in      35
+set_frequency clk_in 12
+
+# Button
+set_io -nowarn -pullup yes btn          2
+
+# RGB LEDs
+set_io -nowarn             rgb[0]      39
+set_io -nowarn             rgb[1]      40
+set_io -nowarn             rgb[2]      41
diff --git a/gateware/data/top-ice40-usbtrace.pcf b/gateware/data/top-ice40-usbtrace.pcf
index 7847762..4a09c28 100644
--- a/gateware/data/top-ice40-usbtrace.pcf
+++ b/gateware/data/top-ice40-usbtrace.pcf
@@ -1,11 +1,11 @@
 # USP tap
-set_io -nowarn             tap_dp      3
-set_io -nowarn             tap_dn      4
+set_io -nowarn             tap_dp      42
+set_io -nowarn             tap_dn      43
 
 # USB
-set_io -nowarn             usb_dp      42
-set_io -nowarn             usb_dn      38
-set_io -nowarn             usb_pu      37
+set_io -nowarn             usb_dp      3
+set_io -nowarn             usb_dn      4
+set_io -nowarn             usb_pu      2
 
 # Flash & PSRAM
 set_io -nowarn             spi_sck     15
@@ -14,39 +14,20 @@ set_io -nowarn             spi_io[1]   17
 set_io -nowarn             spi_io[2]   18
 set_io -nowarn             spi_io[3]   19
 set_io -nowarn -pullup yes spi_cs_n[0] 16
-set_io -nowarn -pullup yes spi_cs_n[1]  6
+set_io -nowarn -pullup yes spi_cs_n[1] 20
 
 # UART
-set_io -nowarn -pullup yes uart_rx     47
-set_io -nowarn             uart_tx     44
+set_io -nowarn -pullup yes uart_rx     26
+set_io -nowarn             uart_tx     27
 
 # Clock
 set_io -nowarn             clk_in      35
 set_frequency clk_in 12
 
 # Button
-set_io -nowarn -pullup yes btn          2
+set_io -nowarn -pullup yes btn         25
 
 # RGB LEDs
 set_io -nowarn             rgb[0]      39
 set_io -nowarn             rgb[1]      40
 set_io -nowarn             rgb[2]      41
-
-# Debug
-set_io -nowarn dbg[0] 43
-set_io -nowarn dbg[1] 32
-set_io -nowarn dbg[2] 26
-set_io -nowarn dbg[3] 28
-set_io -nowarn dbg[4] 36
-set_io -nowarn dbg[5] 31
-set_io -nowarn dbg[6] 27
-set_io -nowarn dbg[7] 34
-set_io -nowarn dbg[8] 23
-set_io -nowarn dbg[9] 12
-set_io -nowarn dbg[10] 13
-set_io -nowarn dbg[11] 11
-set_io -nowarn dbg[12] 25
-set_io -nowarn dbg[13] 21
-set_io -nowarn dbg[14] 20
-set_io -nowarn dbg[15] 46
-