Update to prjtrellis fa8444b60f717ff7088ca2ec779b2cea390abe76
Signed-off-by: David Shah <davey1576@gmail.com>
diff --git a/ECP5/tiledata/ECLK_L/bits.db b/ECP5/tiledata/ECLK_L/bits.db
index 19d0e20..3355227 100644
--- a/ECP5/tiledata/ECLK_L/bits.db
+++ b/ECP5/tiledata/ECLK_L/bits.db
@@ -1,4 +1,72 @@
# Routing Mux Bits
+.mux S1W2_ECLKI0
+G_JLLCPLL0CLKOP F8B0 !F9B0 F10B0 F11B0
+G_JLLCPLL0CLKOS !F8B0 !F9B0 F10B0 F11B0
+G_JLLQECLKCIB0 F8B0 !F9B0 !F10B0 F11B0
+G_JPCLKT60 !F8B0 F9B0 F10B0 !F11B0
+G_JPCLKT61 F8B0 F9B0 F10B0 !F11B0
+G_JPCLKT70 !F8B0 !F9B0 F10B0 !F11B0
+G_JPCLKT71 F8B0 !F9B0 F10B0 !F11B0
+G_JULCPLL0CLKOP F8B0 F9B0 !F10B0 F11B0
+G_JULCPLL0CLKOS !F8B0 F9B0 !F10B0 F11B0
+G_JULQECLKCIB0 !F8B0 !F9B0 !F10B0 F11B0
+
+.mux S1W2_JECLK0
+S1W2_JBRGECLK0 F20B0 !F21B0
+S1W2_JNEIGHBORECLK0 !F20B0 F21B0
+S1W2_SYNCECLK0 !F20B0 !F21B0
+
+.mux S1W2_JECLK1
+S1W2_JBRGECLK1 F22B0 !F23B0
+S1W2_JNEIGHBORECLK1 !F22B0 F23B0
+S1W2_SYNCECLK1 !F22B0 !F23B0
+
+.mux S1W2_JECLKI1
+G_JLLCPLL0CLKOP F12B0 !F13B0 F14B0 F15B0
+G_JLLCPLL0CLKOS !F12B0 !F13B0 F14B0 F15B0
+G_JLLQECLKCIB1 F12B0 !F13B0 !F14B0 F15B0
+G_JPCLKT60 !F12B0 F13B0 F14B0 !F15B0
+G_JPCLKT61 F12B0 F13B0 F14B0 !F15B0
+G_JPCLKT70 !F12B0 !F13B0 F14B0 !F15B0
+G_JPCLKT71 F12B0 !F13B0 F14B0 !F15B0
+G_JULCPLL0CLKOP F12B0 F13B0 !F14B0 F15B0
+G_JULCPLL0CLKOS !F12B0 F13B0 !F14B0 F15B0
+G_JULQECLKCIB1 !F12B0 !F13B0 !F14B0 F15B0
+
+.mux W2_ECLKI0
+G_JLLCPLL0CLKOP F0B0 !F1B0 F2B0 F3B0
+G_JLLCPLL0CLKOS !F0B0 !F1B0 F2B0 F3B0
+G_JLLQECLKCIB0 F0B0 !F1B0 !F2B0 F3B0
+G_JPCLKT60 !F0B0 F1B0 F2B0 !F3B0
+G_JPCLKT61 F0B0 F1B0 F2B0 !F3B0
+G_JPCLKT70 !F0B0 !F1B0 F2B0 !F3B0
+G_JPCLKT71 F0B0 !F1B0 F2B0 !F3B0
+G_JULCPLL0CLKOP F0B0 F1B0 !F2B0 F3B0
+G_JULCPLL0CLKOS !F0B0 F1B0 !F2B0 F3B0
+G_JULQECLKCIB0 !F0B0 !F1B0 !F2B0 F3B0
+
+.mux W2_JECLK0
+W2_JBRGECLK0 F16B0 !F17B0
+W2_JNEIGHBORECLK0 !F16B0 F17B0
+W2_SYNCECLK0 !F16B0 !F17B0
+
+.mux W2_JECLK1
+W2_JBRGECLK1 F18B0 !F19B0
+W2_JNEIGHBORECLK1 !F18B0 F19B0
+W2_SYNCECLK1 !F18B0 !F19B0
+
+.mux W2_JECLKI1
+G_JLLCPLL0CLKOP F4B0 !F5B0 F6B0 F7B0
+G_JLLCPLL0CLKOS !F4B0 !F5B0 F6B0 F7B0
+G_JLLQECLKCIB1 F4B0 !F5B0 !F6B0 F7B0
+G_JPCLKT60 !F4B0 F5B0 F6B0 !F7B0
+G_JPCLKT61 F4B0 F5B0 F6B0 !F7B0
+G_JPCLKT70 !F4B0 !F5B0 F6B0 !F7B0
+G_JPCLKT71 F4B0 !F5B0 F6B0 !F7B0
+G_JULCPLL0CLKOP F4B0 F5B0 !F6B0 F7B0
+G_JULCPLL0CLKOS !F4B0 F5B0 !F6B0 F7B0
+G_JULQECLKCIB1 !F4B0 !F5B0 !F6B0 F7B0
+
# Non-Routing Configuration
.config_enum CLKDIV_L0.DIV
@@ -19,23 +87,87 @@
# Fixed Connections
+.fixed_conn G_BANK6ECLK0 S1W2_JECLK0
+
+.fixed_conn G_BANK6ECLK1 S1W2_JECLK1
+
+.fixed_conn G_BANK7ECLK0 W2_JECLK0
+
+.fixed_conn G_BANK7ECLK1 W2_JECLK1
+
.fixed_conn G_JLCDIVX0 W2_JCDIVX_CLKDIV0
.fixed_conn G_JLCDIVX1 W2_JCDIVX_CLKDIV1
+.fixed_conn G_JLLQECLKCIB0 S2W1_JCLK0
+
+.fixed_conn G_JLLQECLKCIB1 S2W1_JCLK1
+
+.fixed_conn G_JULQECLKCIB0 N1W1_JCLK0
+
+.fixed_conn G_JULQECLKCIB1 N1W1_JCLK1
+
.fixed_conn JF2 W2_JCDIVX_CLKDIV0
.fixed_conn JF3 W2_JCDIVX_CLKDIV1
+.fixed_conn S1W2_ECLKI_ECLKSYNC0 S1W2_ECLKI0
+
+.fixed_conn S1W2_ECLKI_ECLKSYNC1 S1W2_JECLKI1
+
+.fixed_conn S1W2_JBRGECLK0 45K_E38_JBRGECLK0
+
+.fixed_conn S1W2_JBRGECLK1 45K_E38_JBRGECLK1
+
+.fixed_conn S1W2_JECLKO_ECLKSYNC0 S1W2_ECLKI_ECLKSYNC0
+
+.fixed_conn S1W2_JECLKO_ECLKSYNC1 S1W2_ECLKI_ECLKSYNC1
+
+.fixed_conn S1W2_JNEIGHBORECLK0 W2_JECLKO_ECLKSYNC0
+
+.fixed_conn S1W2_JNEIGHBORECLK1 W2_JECLKO_ECLKSYNC1
+
+.fixed_conn S1W2_JSTOP_ECLKSYNC0 JC0
+
+.fixed_conn S1W2_JSTOP_ECLKSYNC1 JD0
+
+.fixed_conn S1W2_SYNCECLK0 S1W2_JECLKO_ECLKSYNC0
+
+.fixed_conn S1W2_SYNCECLK1 S1W2_JECLKO_ECLKSYNC1
+
.fixed_conn W2_CLKI_CLKDIV0 W2_CLKI0
.fixed_conn W2_CLKI_CLKDIV1 W2_CLKI1
+.fixed_conn W2_ECLKI_ECLKSYNC0 W2_ECLKI0
+
+.fixed_conn W2_ECLKI_ECLKSYNC1 W2_JECLKI1
+
.fixed_conn W2_JALIGNWD_CLKDIV0 JA3
.fixed_conn W2_JALIGNWD_CLKDIV1 JB3
+.fixed_conn W2_JBRGECLK0 45K_E38_JBRGECLK0
+
+.fixed_conn W2_JBRGECLK1 45K_E38_JBRGECLK1
+
+.fixed_conn W2_JECLKO_ECLKSYNC0 W2_ECLKI_ECLKSYNC0
+
+.fixed_conn W2_JECLKO_ECLKSYNC1 W2_ECLKI_ECLKSYNC1
+
+.fixed_conn W2_JNEIGHBORECLK0 S1W2_JECLKO_ECLKSYNC0
+
+.fixed_conn W2_JNEIGHBORECLK1 S1W2_JECLKO_ECLKSYNC1
+
.fixed_conn W2_JRST_CLKDIV0 JLSR0
.fixed_conn W2_JRST_CLKDIV1 JLSR1
+.fixed_conn W2_JSTOP_ECLKSYNC0 JA0
+
+.fixed_conn W2_JSTOP_ECLKSYNC1 JB0
+
+.fixed_conn W2_SYNCECLK0 W2_JECLKO_ECLKSYNC0
+
+.fixed_conn W2_SYNCECLK1 W2_JECLKO_ECLKSYNC1
+
diff --git a/ECP5/tiledata/ECLK_R/bits.db b/ECP5/tiledata/ECLK_R/bits.db
index 3141f2b..0303a9d 100644
--- a/ECP5/tiledata/ECLK_R/bits.db
+++ b/ECP5/tiledata/ECLK_R/bits.db
@@ -1,4 +1,72 @@
# Routing Mux Bits
+.mux E2_ECLKI1
+G_JLRCPLL0CLKOP F4B0 !F5B0 F6B0 F7B0
+G_JLRCPLL0CLKOS !F4B0 !F5B0 F6B0 F7B0
+G_JLRQECLKCIB1 F4B0 !F5B0 !F6B0 F7B0
+G_JPCLKT20 !F4B0 !F5B0 F6B0 !F7B0
+G_JPCLKT21 F4B0 !F5B0 F6B0 !F7B0
+G_JPCLKT30 !F4B0 F5B0 F6B0 !F7B0
+G_JPCLKT31 F4B0 F5B0 F6B0 !F7B0
+G_JURCPLL0CLKOP F4B0 F5B0 !F6B0 F7B0
+G_JURCPLL0CLKOS !F4B0 F5B0 !F6B0 F7B0
+G_JURQECLKCIB1 !F4B0 !F5B0 !F6B0 F7B0
+
+.mux E2_JECLK0
+E2_JBRGECLK0 F16B0 !F17B0
+E2_JNEIGHBORECLK0 !F16B0 F17B0
+E2_SYNCECLK0 !F16B0 !F17B0
+
+.mux E2_JECLK1
+E2_JBRGECLK1 F18B0 !F19B0
+E2_JNEIGHBORECLK1 !F18B0 F19B0
+E2_SYNCECLK1 !F18B0 !F19B0
+
+.mux E2_JECLKI0
+G_JLRCPLL0CLKOP F0B0 !F1B0 F2B0 F3B0
+G_JLRCPLL0CLKOS !F0B0 !F1B0 F2B0 F3B0
+G_JLRQECLKCIB0 F0B0 !F1B0 !F2B0 F3B0
+G_JPCLKT20 !F0B0 !F1B0 F2B0 !F3B0
+G_JPCLKT21 F0B0 !F1B0 F2B0 !F3B0
+G_JPCLKT30 !F0B0 F1B0 F2B0 !F3B0
+G_JPCLKT31 F0B0 F1B0 F2B0 !F3B0
+G_JURCPLL0CLKOP F0B0 F1B0 !F2B0 F3B0
+G_JURCPLL0CLKOS !F0B0 F1B0 !F2B0 F3B0
+G_JURQECLKCIB0 !F0B0 !F1B0 !F2B0 F3B0
+
+.mux S1E2_ECLKI1
+G_JLRCPLL0CLKOP F12B0 !F13B0 F14B0 F15B0
+G_JLRCPLL0CLKOS !F12B0 !F13B0 F14B0 F15B0
+G_JLRQECLKCIB1 F12B0 !F13B0 !F14B0 F15B0
+G_JPCLKT20 !F12B0 !F13B0 F14B0 !F15B0
+G_JPCLKT21 F12B0 !F13B0 F14B0 !F15B0
+G_JPCLKT30 !F12B0 F13B0 F14B0 !F15B0
+G_JPCLKT31 F12B0 F13B0 F14B0 !F15B0
+G_JURCPLL0CLKOP F12B0 F13B0 !F14B0 F15B0
+G_JURCPLL0CLKOS !F12B0 F13B0 !F14B0 F15B0
+G_JURQECLKCIB1 !F12B0 !F13B0 !F14B0 F15B0
+
+.mux S1E2_JECLK0
+S1E2_JBRGECLK0 F20B0 !F21B0
+S1E2_JNEIGHBORECLK0 !F20B0 F21B0
+S1E2_SYNCECLK0 !F20B0 !F21B0
+
+.mux S1E2_JECLK1
+S1E2_JBRGECLK1 F22B0 !F23B0
+S1E2_JNEIGHBORECLK1 !F22B0 F23B0
+S1E2_SYNCECLK1 !F22B0 !F23B0
+
+.mux S1E2_JECLKI0
+G_JLRCPLL0CLKOP F8B0 !F9B0 F10B0 F11B0
+G_JLRCPLL0CLKOS !F8B0 !F9B0 F10B0 F11B0
+G_JLRQECLKCIB0 F8B0 !F9B0 !F10B0 F11B0
+G_JPCLKT20 !F8B0 !F9B0 F10B0 !F11B0
+G_JPCLKT21 F8B0 !F9B0 F10B0 !F11B0
+G_JPCLKT30 !F8B0 F9B0 F10B0 !F11B0
+G_JPCLKT31 F8B0 F9B0 F10B0 !F11B0
+G_JURCPLL0CLKOP F8B0 F9B0 !F10B0 F11B0
+G_JURCPLL0CLKOS !F8B0 F9B0 !F10B0 F11B0
+G_JURQECLKCIB0 !F8B0 !F9B0 !F10B0 F11B0
+
# Non-Routing Configuration
.config_enum CLKDIV_R0.DIV
@@ -27,15 +95,79 @@
.fixed_conn E2_CLKI_CLKDIV1 E2_CLKI1
+.fixed_conn E2_ECLKI_ECLKSYNC0 E2_JECLKI0
+
+.fixed_conn E2_ECLKI_ECLKSYNC1 E2_ECLKI1
+
.fixed_conn E2_JALIGNWD_CLKDIV0 JA3
.fixed_conn E2_JALIGNWD_CLKDIV1 JB3
+.fixed_conn E2_JBRGECLK0 45K_W48_JBRGECLK0
+
+.fixed_conn E2_JBRGECLK1 45K_W48_JBRGECLK1
+
+.fixed_conn E2_JECLKO_ECLKSYNC0 E2_ECLKI_ECLKSYNC0
+
+.fixed_conn E2_JECLKO_ECLKSYNC1 E2_ECLKI_ECLKSYNC1
+
+.fixed_conn E2_JNEIGHBORECLK0 S1E2_JECLKO_ECLKSYNC0
+
+.fixed_conn E2_JNEIGHBORECLK1 S1E2_JECLKO_ECLKSYNC1
+
.fixed_conn E2_JRST_CLKDIV0 JLSR0
.fixed_conn E2_JRST_CLKDIV1 JLSR1
+.fixed_conn E2_JSTOP_ECLKSYNC0 JA0
+
+.fixed_conn E2_JSTOP_ECLKSYNC1 JB0
+
+.fixed_conn E2_SYNCECLK0 E2_JECLKO_ECLKSYNC0
+
+.fixed_conn E2_SYNCECLK1 E2_JECLKO_ECLKSYNC1
+
+.fixed_conn G_BANK2ECLK0 E2_JECLK0
+
+.fixed_conn G_BANK2ECLK1 E2_JECLK1
+
+.fixed_conn G_BANK3ECLK0 S1E2_JECLK0
+
+.fixed_conn G_BANK3ECLK1 S1E2_JECLK1
+
+.fixed_conn G_JLRQECLKCIB0 S2E1_JCLK0
+
+.fixed_conn G_JLRQECLKCIB1 S2E1_JCLK1
+
+.fixed_conn G_JURQECLKCIB0 N1E1_JCLK0
+
+.fixed_conn G_JURQECLKCIB1 N1E1_JCLK1
+
.fixed_conn JF2 E2_JCDIVX_CLKDIV0
.fixed_conn JF3 E2_JCDIVX_CLKDIV1
+.fixed_conn S1E2_ECLKI_ECLKSYNC0 S1E2_JECLKI0
+
+.fixed_conn S1E2_ECLKI_ECLKSYNC1 S1E2_ECLKI1
+
+.fixed_conn S1E2_JBRGECLK0 45K_W48_JBRGECLK0
+
+.fixed_conn S1E2_JBRGECLK1 45K_W48_JBRGECLK1
+
+.fixed_conn S1E2_JECLKO_ECLKSYNC0 S1E2_ECLKI_ECLKSYNC0
+
+.fixed_conn S1E2_JECLKO_ECLKSYNC1 S1E2_ECLKI_ECLKSYNC1
+
+.fixed_conn S1E2_JNEIGHBORECLK0 E2_JECLKO_ECLKSYNC0
+
+.fixed_conn S1E2_JNEIGHBORECLK1 E2_JECLKO_ECLKSYNC1
+
+.fixed_conn S1E2_JSTOP_ECLKSYNC0 JC0
+
+.fixed_conn S1E2_JSTOP_ECLKSYNC1 JD0
+
+.fixed_conn S1E2_SYNCECLK0 S1E2_JECLKO_ECLKSYNC0
+
+.fixed_conn S1E2_SYNCECLK1 S1E2_JECLKO_ECLKSYNC1
+
