Merge branch 'fpga_next' into next

Conflicts:
	fpga/usrp2/top/u1e_passthru/.gitignore
	fpga/usrp2/top/u1e_passthru/Makefile
	fpga/usrp2/top/u2plus/.gitignore
	fpga/usrp2/top/u2plus/Makefile
	usrp2/top/u1e_passthru/.gitignore
	usrp2/top/u1e_passthru/Makefile

1 files changed, 23 insertions, 0 deletions

diff --git a/fpga/usrp2/top/safe_u2plus/safe_u2plus.v b/fpga/usrp2/top/safe_u2plus/safe_u2plus.v
new file mode 100644
index 000000000..dca9688c5
--- /dev/null
+++ b/fpga/usrp2/top/safe_u2plus/safe_u2plus.v
@@ -0,0 +1,23 @@
+`timescale 1ns / 1ps
+//////////////////////////////////////////////////////////////////////////////////
+
+module safe_u2plus
+  (
+   input CLK_FPGA_P, input CLK_FPGA_N,  // Diff
+   output [5:1] leds,  // LED4 is shared w/INIT_B
+   output ETH_LED
+   );
+
+   wire   clk_fpga;
+   
+   IBUFGDS clk_fpga_pin (.O(clk_fpga),.I(CLK_FPGA_P),.IB(CLK_FPGA_N));
+   defparam 	clk_fpga_pin.IOSTANDARD = "LVPECL_25";
+
+   reg [31:0] 	ctr;
+
+   always @(posedge clk_fpga)
+     ctr <= ctr + 1;
+
+   assign {leds,ETH_LED} = ~ctr[29:24];
+   
+endmodule // safe_u2plus