Virtex6: Add spiOverJtag for Virtex6, detect xc6vlx130 and provide bitfile for xc6vlx130tff784

doc/FPGAs.yml

@@ -235,6 +235,13 @@ Xilinx:
     Memory: OK
     Flash: NA
 
+  - Description: Virtex 6
+    Model:
+      - xc6vlx130t
+    URL: https://www.xilinx.com/products/silicon-devices/fpga/virtex-6.html
+    Memory: OK
+    Flash: OK
+
   - Description: Virtex UltraScale+
     Model:
       - xcvu9p

spiOverJtag/Makefile

@@ -2,6 +2,7 @@ XILINX_PARTS := xc3s500evq100 \
 	xc6slx9tqg144 xc6slx9csg324 \
 	xc6slx16ftg256 xc6slx16csg324 xc6slx45csg324 xc6slx100fgg484 \
 	xc6slx150tfgg484 xc6slx150tcsg484 \
+	xc6vlx130tff784 \
 	xc7a15tcpg236 \
 	xc7a25tcpg238 xc7a25tcsg325 \
 	xc7a35tcpg236 xc7a35tcsg324 xc7a35tftg256 xc7a35tfgg484 \

spiOverJtag/build.py

@@ -55,6 +55,10 @@ elif subpart == "xc3s":
     family = "Spartan3E"
     tool = "ise"
     speed = -4
+elif subpart == "xc6v":
+    family = "Virtex6"
+    tool = "ise"
+    speed = -1
 elif subpart in ["xcvu", "xcku"]:
     family = "Xilinx UltraScale"
     tool = "vivado"
@@ -73,6 +77,7 @@ if tool in ["ise", "vivado"]:
         "xc6slx100fgg484"  : "xc6s_fgg484",
         "xc6slx150tcsg484" : "xc6s_csg484",
         "xc6slx150tfgg484" : "xc6s_fgg484",
+        "xc6vlx130tff784"  : "xc6v_ff784",
         "xc7a15tcpg236"    : "xc7a_cpg236",
         "xc7a25tcpg238"    : "xc7a_cpg238",
         "xc7a25tcsg325"    : "xc7a_csg325",
@@ -116,6 +121,7 @@ if tool in ["ise", "vivado"]:
                             "xc6slx100fgg484":  "xc6slx100",
                             "xc6slx150tcsg484": "xc6slx150t",
                             "xc6slx150tfgg484": "xc6slx150t",
+                            "xc6vlx130tff784":  "xc6vlx130t",
                             "xc7k325tffg676":   "xc7k325t",
                             "xc7k325tffg900":   "xc7k325t",
                             "xc7k420tffg901":   "xc7k420t",
@@ -130,6 +136,7 @@ if tool in ["ise", "vivado"]:
                             "xc6slx100fgg484":  "fgg484",
                             "xc6slx150tcsg484": "csg484",
                             "xc6slx150tfgg484": "fgg484",
+                            "xc6vlx130tff784":  "ff784",
                             "xc7k325tffg676":   "ffg676",
                             "xc7k325tffg900":   "ffg900",
                             "xc7k420tffg901":   "ffg901",

spiOverJtag/constr_xc6v_ff784.ucf

@@ -0,0 +1,2 @@
+NET "sdi_dq0"  LOC = AF24 | IOSTANDARD = LVCMOS25;
+NET "csn"      LOC = AE24 | IOSTANDARD = LVCMOS25;

spiOverJtag/xilinx_spiOverJtag.v

@@ -13,6 +13,9 @@ module spiOverJtag
 	output csn,
 	output sdi_dq0,
 	input  sdo_dq1
+`elsif virtex6
+	output csn,
+	output sdi_dq0
 `elsif xilinxultrascale
 `else
  // Xilinx 7 but not ultrascale
@@ -44,7 +47,12 @@ module spiOverJtag
 `endif
 	// jtag -> spi flash
 	assign sdi_dq0 = tdi;
+`ifdef virtex6
+	wire di;
+	wire tdo = (sel) ? di : tdi;
+`else
 	wire tdo = (sel) ? sdo_dq1 : tdi;
+`endif
 	assign  csn = fsm_csn;
 
 	wire tmp_cap_s = capture && sel;
@@ -98,6 +106,26 @@ module spiOverJtag
 	assign runtest = tmp_up_s;
 `elsif spartan6
 	assign sck = drck;
+`elsif virtex6
+	STARTUP_VIRTEX6 #(
+		.PROG_USR("FALSE")
+	) startup_virtex6_inst (
+		.CFGCLK(),        // unused
+		.CFGMCLK(),       // unused
+		.CLK(1'b0),       // unused
+		.DINSPI(di),      // data from SPI flash
+		.EOS(),
+		.GSR(1'b0),       // unused
+		.GTS(1'b0),       // unused
+		.KEYCLEARB(1'b0),  // not used
+		.PACK(1'b1),      // tied low for 'safe' operations
+		.PREQ(),          // unused
+		.TCKSPI(),        // echo of CCLK from TCK pin
+		.USRCCLKO (drck), // user FPGA -> CCLK pin
+		.USRCCLKTS(1'b0), // drive CCLK not in high-Z
+		.USRDONEO (1'b1), // why both USRDONE are high?
+		.USRDONETS(1'b1)  // ??
+	);
 `else
 	STARTUPE2 #(
 		.PROG_USR("FALSE"),  // Activate program event security feature. Requires encrypted bitstreams.
@@ -138,7 +166,9 @@ module spiOverJtag
 		.TDO2   ()         // 1-bit input: USER2 function
 	);
 `else
-`ifdef spartan6
+`ifdef virtex6
+	BSCAN_VIRTEX6 #(
+`elsif spartan6
 	BSCAN_SPARTAN6 #(
 `else
 	BSCANE2 #(

src/part.hpp

@@ -64,6 +64,9 @@ static std::map <uint32_t, fpga_model> fpga_list = {
 	{0x037c4093, {"xilinx", "spartan7", "xc7s25",          6}},
 	{0x0362f093, {"xilinx", "spartan7", "xc7s50",          6}},
 
+	/* Xilinx Virtex6 */
+	{0x8424a093, {"xilinx", "virtex6", "xc6vlx130t", 10}},
+
 	/* Xilinx 7-Series / Artix7 */
 	{0x037c2093, {"xilinx", "artix a7 25t",  "xc7a25",  6}},
 	{0x0362D093, {"xilinx", "artix a7 35t",  "xc7a35",  6}},