miegl/b210-k7-fpga
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fpga: Updating FPGA code for UHD-3.7.2-rc1

Browse Source 
Original-commit: b63507efb3cf1a8fa20794c452d57028e18da182
This commit is contained in:
Ben Hilburn
2014-07-22 15:49:02 -07:00
parent 5a525c84f5
commit 85ad83d8d3
58 changed files with 3179 additions and 3154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/dsp/ddc_chain.v
+9 -7
View File
@@ -1,5 +1,5 @@
// //
// Copyright 2011-2013 Ettus Research LLC // Copyright 2011-2014 Ettus Research LLC
// //
@@ -45,6 +45,8 @@ module ddc_chain
reg [WIDTH-1:0] rx_fe_i_mux, rx_fe_q_mux; reg [WIDTH-1:0] rx_fe_i_mux, rx_fe_q_mux;
wire realmode; wire realmode;
wire swap_iq; wire swap_iq;
wire invert_i;
wire invert_q;
setting_reg #(.my_addr(BASE+0)) sr_0 setting_reg #(.my_addr(BASE+0)) sr_0
(.clk(clk),.rst(rst),.strobe(set_stb),.addr(set_addr), (.clk(clk),.rst(rst),.strobe(set_stb),.addr(set_addr),
@@ -58,22 +60,22 @@ module ddc_chain
(.clk(clk),.rst(rst),.strobe(set_stb),.addr(set_addr), (.clk(clk),.rst(rst),.strobe(set_stb),.addr(set_addr),
.in(set_data),.out({enable_hb1, enable_hb2, cic_decim_rate}),.changed()); .in(set_data),.out({enable_hb1, enable_hb2, cic_decim_rate}),.changed());
setting_reg #(.my_addr(BASE+3), .width(2)) sr_3 setting_reg #(.my_addr(BASE+3), .width(4)) sr_3
(.clk(clk),.rst(rst),.strobe(set_stb),.addr(set_addr), (.clk(clk),.rst(rst),.strobe(set_stb),.addr(set_addr),
.in(set_data),.out({realmode,swap_iq}),.changed()); .in(set_data),.out({invert_i,inver_q,realmode,swap_iq}),.changed());
// MUX so we can do realmode signals on either input // MUX so we can do realmode signals on either input
always @(posedge clk) always @(posedge clk)
if(swap_iq) if(swap_iq)
begin begin
rx_fe_i_mux <= rx_fe_q; rx_fe_i_mux <= invert_i ? ~rx_fe_q + 1 : rx_fe_q;
rx_fe_q_mux <= realmode ? 0 : rx_fe_i; rx_fe_q_mux <= realmode ? 0 : invert_q ? ~rx_fe_i + 1 : rx_fe_i;
end end
else else
begin begin
rx_fe_i_mux <= rx_fe_i; rx_fe_i_mux <= invert_i ? ~rx_fe_i + 1 : rx_fe_i;
rx_fe_q_mux <= realmode ? 0 : rx_fe_q; rx_fe_q_mux <= realmode ? 0 : invert_i ? ~rx_fe_q + 1 : rx_fe_q;
end end
// NCO // NCO
lib/timing/Makefile.srcs
+1
View File
@@ -8,4 +8,5 @@
TIMING_SRCS = $(abspath $(addprefix $(BASE_DIR)/../lib/timing/, \ TIMING_SRCS = $(abspath $(addprefix $(BASE_DIR)/../lib/timing/, \
time_compare.v \ time_compare.v \
timekeeper.v \ timekeeper.v \
pps.v\
)) ))
lib/timing/pps.v
+22
View File
@@ -0,0 +1,22 @@
//
// Copyright 2014 Ettus Research LLC
//
module pps_generator
#(parameter CLK_FREQ=0, DUTY=25)
(input clk, input reset, output pps);
reg[31:0] count;
always @(posedge clk) begin
if (reset) begin
count <= 32'b1;
end else if (count >= CLK_FREQ) begin
count <= 32'b1;
end else begin
count <= count + 1'b1;
end
end
assign pps = (count < CLK_FREQ * DUTY / 100);
endmodule //pps_generator
lib/timing/timekeeper.v
+13 -7
View File
@@ -1,5 +1,5 @@
// //
// Copyright 2013 Ettus Research LLC // Copyright 2013-2014 Ettus Research LLC
// //
@@ -37,12 +37,6 @@ module timekeeper
wire pps_edge = !pps_del2 & pps_del; wire pps_edge = !pps_del2 & pps_del;
//////////////////////////////////////////////////////////////////////////
// track the time at last pps so host can detect the pps
//////////////////////////////////////////////////////////////////////////
always @(posedge clk)
if(pps_edge) vita_time_lastpps <= vita_time;
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// arm the trigger to latch a new time when the ctrl register is written // arm the trigger to latch a new time when the ctrl register is written
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@@ -65,4 +59,16 @@ module timekeeper
else else
vita_time <= vita_time + 64'h1; vita_time <= vita_time + 64'h1;
//////////////////////////////////////////////////////////////////////////
// track the time at last pps so host can detect the pps
//////////////////////////////////////////////////////////////////////////
always @(posedge clk)
if(reset)
vita_time_lastpps <= 64'h0;
else if(pps_edge)
if(time_event)
vita_time_lastpps <= time_at_next_event;
else
vita_time_lastpps <= vita_time + 64'h1;
endmodule // timekeeper endmodule // timekeeper
top/b200/b200_core.v
+19 -6
View File
@@ -1,5 +1,5 @@
// //
// Copyright 2013 Ettus Research LLC // Copyright 2013-14 Ettus Research LLC
// //
@@ -78,11 +78,24 @@ module b200_core
/******************************************************************* /*******************************************************************
* PPS Timing stuff * PPS Timing stuff
******************************************************************/ ******************************************************************/
reg [1:0] int_pps_del, ext_pps_del;
// Generate an internal PPS signal
wire int_pps;
pps_generator #(.CLK_FREQ(100000000)) pps_gen
(.clk(bus_clk), .pps(int_pps));
// Flop PPS signals into radio clock domain
reg [1:0] gpsdo_pps_del, ext_pps_del, int_pps_del;
always @(posedge radio_clk) ext_pps_del[1:0] <= {ext_pps_del[0], pps_ext}; always @(posedge radio_clk) ext_pps_del[1:0] <= {ext_pps_del[0], pps_ext};
always @(posedge radio_clk) int_pps_del[1:0] <= {int_pps_del[0], pps_int}; always @(posedge radio_clk) gpsdo_pps_del[1:0] <= {gpsdo_pps_del[0], pps_int};
wire pps_select; always @(posedge radio_clk) int_pps_del[1:0] <= {int_pps_del[0], int_pps};
wire pps = pps_select? ext_pps_del[1] : int_pps_del[1];
// PPS mux
wire [1:0] pps_select;
wire pps = (pps_select == 2'b00)? gpsdo_pps_del[1] :
(pps_select == 2'b01)? ext_pps_del[1] :
(pps_select == 2'b10)? int_pps_del[1] :
1'b0;
/******************************************************************* /*******************************************************************
* Response mux Routing logic * Response mux Routing logic
@@ -189,7 +202,7 @@ module b200_core
(.clk(bus_clk), .rst(1'b0/*keep*/), .strobe(set_stb), .addr(set_addr), .in(set_data), (.clk(bus_clk), .rst(1'b0/*keep*/), .strobe(set_stb), .addr(set_addr), .in(set_data),
.out(gpsdo_st), .changed()); .out(gpsdo_st), .changed());
setting_reg #(.my_addr(SR_CORE_PPS_SEL), .awidth(8), .width(1)) sr_pps_sel setting_reg #(.my_addr(SR_CORE_PPS_SEL), .awidth(8), .width(2)) sr_pps_sel
(.clk(bus_clk), .rst(bus_rst), .strobe(set_stb), .addr(set_addr), .in(set_data), (.clk(bus_clk), .rst(bus_rst), .strobe(set_stb), .addr(set_addr), .in(set_data),
.out(pps_select), .changed()); .out(pps_select), .changed());
top/b200/coregen/chipscope_icon.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/b200/coregen/chipscope_icon.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="chipscope_icon.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="chipscope_icon.ngc" xil_pn:type="FILE_NGC">
top/b200/coregen/chipscope_ila_128.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/b200/coregen/chipscope_ila_128.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="chipscope_ila_128.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="chipscope_ila_128.ngc" xil_pn:type="FILE_NGC">
top/b200/coregen/chipscope_ila_256.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/b200/coregen/chipscope_ila_256.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="chipscope_ila_256.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="chipscope_ila_256.ngc" xil_pn:type="FILE_NGC">
top/b200/coregen/chipscope_ila_32.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/b200/coregen/chipscope_ila_32.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="chipscope_ila_32.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="chipscope_ila_32.ngc" xil_pn:type="FILE_NGC">
top/b200/coregen/fifo_4k_2clk.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/b200/coregen/fifo_4k_2clk.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="fifo_4k_2clk.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="fifo_4k_2clk.ngc" xil_pn:type="FILE_NGC">
top/b200/coregen/fifo_short_2clk.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/b200/coregen/fifo_short_2clk.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="fifo_short_2clk.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="fifo_short_2clk.ngc" xil_pn:type="FILE_NGC">
top/x300/Makefile
+2 -2
View File
@@ -83,10 +83,10 @@ X310_HGS:
$(call post_build,X310,HGS) $(call post_build,X310,HGS)
X300_HGS: X300_HGS:
make -f Makefile.x300.inc bin NAME=$@ DEVICE=XC7K325T $(HYBRID_SRAM_DEFS) EXTRA_DEFS="$(HYBRID_SRAM_DEFS)" make -f Makefile.x300.inc bin NAME=$@ DEVICE=XC7K325T FLOORPLAN=1 $(HYBRID_SRAM_DEFS) EXTRA_DEFS="$(HYBRID_SRAM_DEFS)"
$(call post_build,X300,HGS) $(call post_build,X300,HGS)
# 1Gig on both ports, SRAM Tx FIFO's # 10Gig on both ports, SRAM Tx FIFO's
X310_XGS: X310_XGS:
make -f Makefile.x300.inc bin NAME=$@ DEVICE=XC7K410T $(XGIGE_SRAM_DEFS) EXTRA_DEFS="$(XGIGE_SRAM_DEFS)" make -f Makefile.x300.inc bin NAME=$@ DEVICE=XC7K410T $(XGIGE_SRAM_DEFS) EXTRA_DEFS="$(XGIGE_SRAM_DEFS)"
$(call post_build,X310,XGS) $(call post_build,X310,XGS)
top/x300/coregen/axi_intercon_2x64_128.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/x300/coregen/axi_intercon_2x64_128.ncf
+4
View File
@@ -0,0 +1,4 @@
NET "*_resync*" TNM = FFS "axi_intercon_2x64_128_reset_resync";
NET "*INTERCONNECT_ARESETN" TNM = FFS "axi_intercon_2x64_128_reset_resync";
TIMESPEC "TS_axi_intercon_2x64_128_reset_resync" = TO "axi_intercon_2x64_128_reset_resync" TIG;
top/x300/coregen/axi_intercon_2x64_128.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="axi_intercon_2x64_128/hdl/verilog/ict106_a_axi3_conv.v" xil_pn:type="FILE_VERILOG"> <file xil_pn:name="axi_intercon_2x64_128/hdl/verilog/ict106_a_axi3_conv.v" xil_pn:type="FILE_VERILOG">
top/x300/coregen/bootram.coe
+3036 -3036
View File
File diff suppressed because it is too large Load Diff
top/x300/coregen/chipscope_icon.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/x300/coregen/chipscope_icon.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="chipscope_icon.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="chipscope_icon.ngc" xil_pn:type="FILE_NGC">
top/x300/coregen/chipscope_icon_2port.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/x300/coregen/chipscope_icon_2port.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="chipscope_icon_2port.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="chipscope_icon_2port.ngc" xil_pn:type="FILE_NGC">
top/x300/coregen/chipscope_ila.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/x300/coregen/chipscope_ila.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="chipscope_ila.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="chipscope_ila.ngc" xil_pn:type="FILE_NGC">
top/x300/coregen/chipscope_ila_64.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/x300/coregen/chipscope_ila_64.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="chipscope_ila_64.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="chipscope_ila_64.ngc" xil_pn:type="FILE_NGC">
top/x300/coregen/coregen.cgp
+1 -1
View File
@@ -1,6 +1,6 @@
SET busformat = BusFormatAngleBracketNotRipped SET busformat = BusFormatAngleBracketNotRipped
SET designentry = Verilog SET designentry = Verilog
SET device = xc7k325t SET device = xc7k410t
SET devicefamily = kintex7 SET devicefamily = kintex7
SET flowvendor = Foundation_ISE SET flowvendor = Foundation_ISE
SET package = ffg900 SET package = ffg900
top/x300/coregen/ddr3_32bit.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/x300/coregen/ddr3_32bit.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="ddr3_32bit/user_design/rtl/axi/mig_7series_v1_8_axi_ctrl_addr_decode.v" xil_pn:type="FILE_VERILOG"> <file xil_pn:name="ddr3_32bit/user_design/rtl/axi/mig_7series_v1_8_axi_ctrl_addr_decode.v" xil_pn:type="FILE_VERILOG">
top/x300/coregen/fifo_short_2clk.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/x300/coregen/fifo_short_2clk.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="fifo_short_2clk.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="fifo_short_2clk.ngc" xil_pn:type="FILE_NGC">
top/x300/coregen/fifo_xlnx_16x40_2clk.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/x300/coregen/fifo_xlnx_16x40_2clk.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="fifo_xlnx_16x40_2clk.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="fifo_xlnx_16x40_2clk.ngc" xil_pn:type="FILE_NGC">
top/x300/coregen_dsp/coregen.cgp
+1 -1
View File
@@ -1,6 +1,6 @@
SET busformat = BusFormatAngleBracketNotRipped SET busformat = BusFormatAngleBracketNotRipped
SET designentry = Verilog SET designentry = Verilog
SET device = xc7k325t SET device = xc7k410t
SET devicefamily = kintex7 SET devicefamily = kintex7
SET flowvendor = Other SET flowvendor = Other
SET package = ffg900 SET package = ffg900
top/x300/coregen_dsp/hbdec1.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/x300/coregen_dsp/hbdec1.ncf
View File
top/x300/coregen_dsp/hbdec1.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="hbdec1.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="hbdec1.ngc" xil_pn:type="FILE_NGC">
top/x300/coregen_dsp/hbdec2.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/x300/coregen_dsp/hbdec2.ncf
View File
top/x300/coregen_dsp/hbdec2.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="hbdec2.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="hbdec2.ngc" xil_pn:type="FILE_NGC">
top/x300/coregen_dsp/hbdec3.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/x300/coregen_dsp/hbdec3.ncf
View File
top/x300/coregen_dsp/hbdec3.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="hbdec3.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="hbdec3.ngc" xil_pn:type="FILE_NGC">
top/x300/coregen_dsp/hbint1.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/x300/coregen_dsp/hbint1.ncf
View File
top/x300/coregen_dsp/hbint1.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="hbint1.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="hbint1.ngc" xil_pn:type="FILE_NGC">
top/x300/coregen_dsp/hbint2.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/x300/coregen_dsp/hbint2.ncf
View File
top/x300/coregen_dsp/hbint2.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="hbint2.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="hbint2.ngc" xil_pn:type="FILE_NGC">
top/x300/coregen_dsp/hbint3.gise
+1 -1
View File
@@ -15,7 +15,7 @@
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
<version xmlns="http://www.xilinx.com/XMLSchema">11.1</version> <version xmlns="http://www.xilinx.com/XMLSchema">11.1</version>
top/x300/coregen_dsp/hbint3.ncf
View File
top/x300/coregen_dsp/hbint3.xise
+2 -2
View File
@@ -9,10 +9,10 @@
<!-- along with the project source files, is sufficient to open and --> <!-- along with the project source files, is sufficient to open and -->
<!-- implement in ISE Project Navigator. --> <!-- implement in ISE Project Navigator. -->
<!-- --> <!-- -->
<!-- Copyright (c) 1995-2012 Xilinx, Inc. All rights reserved. --> <!-- Copyright (c) 1995-2013 Xilinx, Inc. All rights reserved. -->
</header> </header>
<version xil_pn:ise_version="14.4" xil_pn:schema_version="2"/> <version xil_pn:ise_version="14.6" xil_pn:schema_version="2"/>
<files> <files>
<file xil_pn:name="hbint3.ngc" xil_pn:type="FILE_NGC"> <file xil_pn:name="hbint3.ngc" xil_pn:type="FILE_NGC">
top/x300/floorplan_X300.ucf
-26
View File
@@ -1,30 +1,4 @@
INST "x300_core/bus_int/sc/sys_ram/sys_ram0/U0/xst_blk_mem_generator/gnativebmg.native_blk_mem_gen/valid.cstr/ramloop[0].ram.r/v6_init.ram/NO_BMM_INFO.SP.SIMPLE_PRIM36.ram" LOC = RAMB36_X3Y39;
INST "x300_core/bus_int/sc/sys_ram/sys_ram0/U0/xst_blk_mem_generator/gnativebmg.native_blk_mem_gen/valid.cstr/ramloop[1].ram.r/v6_init.ram/NO_BMM_INFO.SP.SIMPLE_PRIM36.ram" LOC = RAMB36_X3Y40;
INST "x300_core/bus_int/sc/sys_ram/sys_ram0/U0/xst_blk_mem_generator/gnativebmg.native_blk_mem_gen/valid.cstr/ramloop[2].ram.r/v6_init.ram/NO_BMM_INFO.SP.SIMPLE_PRIM36.ram" LOC = RAMB36_X3Y41;
INST "x300_core/bus_int/sc/sys_ram/sys_ram0/U0/xst_blk_mem_generator/gnativebmg.native_blk_mem_gen/valid.cstr/ramloop[3].ram.r/v6_init.ram/NO_BMM_INFO.SP.SIMPLE_PRIM36.ram" LOC = RAMB36_X3Y42;
INST "x300_core/bus_int/sc/sys_ram/sys_ram0/U0/xst_blk_mem_generator/gnativebmg.native_blk_mem_gen/valid.cstr/ramloop[4].ram.r/v6_init.ram/NO_BMM_INFO.SP.SIMPLE_PRIM36.ram" LOC = RAMB36_X3Y43;
INST "x300_core/bus_int/sc/sys_ram/sys_ram0/U0/xst_blk_mem_generator/gnativebmg.native_blk_mem_gen/valid.cstr/ramloop[5].ram.r/v6_init.ram/NO_BMM_INFO.SP.SIMPLE_PRIM36.ram" LOC = RAMB36_X3Y44;
INST "x300_core/bus_int/sc/sys_ram/sys_ram0/U0/xst_blk_mem_generator/gnativebmg.native_blk_mem_gen/valid.cstr/ramloop[6].ram.r/v6_init.ram/NO_BMM_INFO.SP.SIMPLE_PRIM36.ram" LOC = RAMB36_X3Y45;
INST "x300_core/bus_int/sc/sys_ram/sys_ram0/U0/xst_blk_mem_generator/gnativebmg.native_blk_mem_gen/valid.cstr/ramloop[7].ram.r/v6_init.ram/NO_BMM_INFO.SP.SIMPLE_PRIM36.ram" LOC = RAMB36_X3Y46;
INST "x300_core/bus_int/sc/sys_ram/sys_ram1/U0/xst_blk_mem_generator/gnativebmg.native_blk_mem_gen/valid.cstr/ramloop[0].ram.r/v6_init.ram/NO_BMM_INFO.SP.SIMPLE_PRIM36.ram" LOC = RAMB36_X4Y39;
INST "x300_core/bus_int/sc/sys_ram/sys_ram1/U0/xst_blk_mem_generator/gnativebmg.native_blk_mem_gen/valid.cstr/ramloop[1].ram.r/v6_init.ram/NO_BMM_INFO.SP.SIMPLE_PRIM36.ram" LOC = RAMB36_X4Y40;
INST "x300_core/bus_int/sc/sys_ram/sys_ram1/U0/xst_blk_mem_generator/gnativebmg.native_blk_mem_gen/valid.cstr/ramloop[2].ram.r/v6_init.ram/NO_BMM_INFO.SP.SIMPLE_PRIM36.ram" LOC = RAMB36_X4Y41;
INST "x300_core/bus_int/sc/sys_ram/sys_ram1/U0/xst_blk_mem_generator/gnativebmg.native_blk_mem_gen/valid.cstr/ramloop[3].ram.r/v6_init.ram/NO_BMM_INFO.SP.SIMPLE_PRIM36.ram" LOC = RAMB36_X4Y42;
INST "x300_core/bus_int/sc/sys_ram/sys_ram1/U0/xst_blk_mem_generator/gnativebmg.native_blk_mem_gen/valid.cstr/ramloop[4].ram.r/v6_init.ram/NO_BMM_INFO.SP.SIMPLE_PRIM36.ram" LOC = RAMB36_X4Y43;
INST "x300_core/bus_int/sc/sys_ram/sys_ram1/U0/xst_blk_mem_generator/gnativebmg.native_blk_mem_gen/valid.cstr/ramloop[5].ram.r/v6_init.ram/NO_BMM_INFO.SP.SIMPLE_PRIM36.ram" LOC = RAMB36_X4Y44;
INST "x300_core/bus_int/sc/sys_ram/sys_ram1/U0/xst_blk_mem_generator/gnativebmg.native_blk_mem_gen/valid.cstr/ramloop[6].ram.r/v6_init.ram/NO_BMM_INFO.SP.SIMPLE_PRIM36.ram" LOC = RAMB36_X4Y45;
INST "x300_core/bus_int/sc/sys_ram/sys_ram1/U0/xst_blk_mem_generator/gnativebmg.native_blk_mem_gen/valid.cstr/ramloop[7].ram.r/v6_init.ram/NO_BMM_INFO.SP.SIMPLE_PRIM36.ram" LOC = RAMB36_X4Y46;
INST "x300_core/bus_int/sc/axi_stream_to_wb/input_stream_bram/Mram_ram1" LOC = RAMB36_X3Y35;
INST "x300_core/bus_int/sc/axi_stream_to_wb/input_stream_bram/Mram_ram2" LOC = RAMB36_X3Y36;
INST "x300_core/bus_int/sc/axi_stream_to_wb/output_stream_bram/Mram_ram1" LOC = RAMB36_X3Y37;
INST "x300_core/bus_int/sc/axi_stream_to_wb/output_stream_bram/Mram_ram2" LOC = RAMB36_X3Y38;
INST "x300_core/bus_int/sc/zpu_top0*" AREA_GROUP = "pblock_0";
AREA_GROUP "pblock_0" RANGE=SLICE_X80Y179:SLICE_X145Y242;
INST "x300_core/radio0/*" AREA_GROUP = "pblock_1"; INST "x300_core/radio0/*" AREA_GROUP = "pblock_1";
AREA_GROUP "pblock_1" RANGE=SLICE_X0Y101:SLICE_X79Y248; AREA_GROUP "pblock_1" RANGE=SLICE_X0Y101:SLICE_X79Y248;
top/x300/gen_ddrlvds.v
+4 -1
View File
@@ -31,6 +31,8 @@ module gen_ddrlvds
reg rising_edge; reg rising_edge;
wire [15:0] i_and_q_2x; wire [15:0] i_and_q_2x;
reg sync_2x; reg sync_2x;
reg sync_dacs_reg;
genvar z; genvar z;
@@ -55,6 +57,7 @@ module gen_ddrlvds
begin begin
i_reg <= i; i_reg <= i;
q_reg <= q; q_reg <= q;
sync_dacs_reg <= sync_dacs;
end end
always @(posedge tx_clk_2x) always @(posedge tx_clk_2x)
@@ -67,7 +70,7 @@ module gen_ddrlvds
// To sync multiple AD9146 DAC's an extended assertion of FRAME is required, // To sync multiple AD9146 DAC's an extended assertion of FRAME is required,
// when sync flag set, squash one rising_edge assertion which causes a 3 word assertion of FRAME, // when sync flag set, squash one rising_edge assertion which causes a 3 word assertion of FRAME,
// also reset sync flag. "sync_dacs" comes from 1x clk and pulse lasts 2 2x clock cycles...this is accounted for. // also reset sync flag. "sync_dacs" comes from 1x clk and pulse lasts 2 2x clock cycles...this is accounted for.
sync_2x <= (phase_eq_phase2x && sync_2x) ? 1'b0 /*RESET */ : (sync_dacs) ? 1'b1 /* SET */ : sync_2x /* HOLD */; sync_2x <= (phase_eq_phase2x && sync_2x) ? 1'b0 /*RESET */ : (sync_dacs_reg) ? 1'b1 /* SET */ : sync_2x /* HOLD */;
rising_edge <= (phase_eq_phase2x && ~sync_2x); rising_edge <= (phase_eq_phase2x && ~sync_2x);
phase_2x <= phase; phase_2x <= phase;
end end