From 5150947e0bfc393b03e49bcb37e1168eb02f5b67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Stro=CC=88mbergson?= Date: Sun, 1 Feb 2015 09:03:37 +0100 Subject: Updated the dcm to generate sys_clk at 50 MHz. Added Pavels project files. --- rtl/src/ipcore/_xmsgs/pn_parser.xmsgs | 2 +- rtl/src/ipcore/clkmgr_dcm.gise | 2 +- rtl/src/ipcore/clkmgr_dcm.v | 17 +- rtl/src/ipcore/clkmgr_dcm.veo | 2 +- rtl/src/ipcore/clkmgr_dcm.xco | 12 +- rtl/src/ipcore/clkmgr_dcm.xise | 341 +++++++++++++++++++++++++++++++++- rtl/src/ipcore/clkmgr_dcm_flist.txt | 1 - 7 files changed, 351 insertions(+), 26 deletions(-) (limited to 'rtl/src') diff --git a/rtl/src/ipcore/_xmsgs/pn_parser.xmsgs b/rtl/src/ipcore/_xmsgs/pn_parser.xmsgs index 2ccce38..8fe7625 100644 --- a/rtl/src/ipcore/_xmsgs/pn_parser.xmsgs +++ b/rtl/src/ipcore/_xmsgs/pn_parser.xmsgs @@ -8,7 +8,7 @@ -Analyzing Verilog file "E:/__DNSSEC/novena_baseline/src/ipcore/clkmgr_dcm.v" into library work +Analyzing Verilog file "Z:/Sandbox/external/cryptech/test/novena_base/rtl/src/ipcore/tmp/_cg/clkmgr_dcm.v" into library work diff --git a/rtl/src/ipcore/clkmgr_dcm.gise b/rtl/src/ipcore/clkmgr_dcm.gise index ae9097a..ed6d0f7 100644 --- a/rtl/src/ipcore/clkmgr_dcm.gise +++ b/rtl/src/ipcore/clkmgr_dcm.gise @@ -19,7 +19,7 @@ 11.1 - + diff --git a/rtl/src/ipcore/clkmgr_dcm.v b/rtl/src/ipcore/clkmgr_dcm.v index b719b86..71477a8 100644 --- a/rtl/src/ipcore/clkmgr_dcm.v +++ b/rtl/src/ipcore/clkmgr_dcm.v @@ -55,7 +55,7 @@ // "Output Output Phase Duty Pk-to-Pk Phase" // "Clock Freq (MHz) (degrees) Cycle (%) Jitter (ps) Error (ps)" //---------------------------------------------------------------------------- -// CLK_OUT1____80.000______0.000______50.0______450.000____150.000 +// CLK_OUT1____50.000______0.000______50.0______200.000____150.000 // //---------------------------------------------------------------------------- // "Input Clock Freq (MHz) Input Jitter (UI)" @@ -92,12 +92,11 @@ module clkmgr_dcm wire [7:0] status_int; wire clkfb; wire clk0; - wire clkfx; DCM_SP #(.CLKDV_DIVIDE (2.000), - .CLKFX_DIVIDE (5), - .CLKFX_MULTIPLY (8), + .CLKFX_DIVIDE (1), + .CLKFX_MULTIPLY (4), .CLKIN_DIVIDE_BY_2 ("FALSE"), .CLKIN_PERIOD (20.0), .CLKOUT_PHASE_SHIFT ("NONE"), @@ -116,7 +115,7 @@ module clkmgr_dcm .CLK270 (), .CLK2X (), .CLK2X180 (), - .CLKFX (clkfx), + .CLKFX (), .CLKFX180 (), .CLKDV (), // Ports for dynamic phase shift @@ -133,17 +132,15 @@ module clkmgr_dcm .DSSEN (1'b0)); assign INPUT_CLK_STOPPED = status_int[1]; - assign CLK_VALID = ( ( locked_int == 1'b 1 ) && ( status_int[2:1] == 2'b 0 ) ); + assign CLK_VALID = ( ( locked_int == 1'b 1 ) && ( status_int[1] == 1'b 0 ) ); // Output buffering //----------------------------------- - BUFG clkf_buf - (.O (clkfb), - .I (clk0)); + assign clkfb = CLK_OUT1; BUFG clkout1_buf (.O (CLK_OUT1), - .I (clkfx)); + .I (clk0)); diff --git a/rtl/src/ipcore/clkmgr_dcm.veo b/rtl/src/ipcore/clkmgr_dcm.veo index fa19d52..c4e1d31 100644 --- a/rtl/src/ipcore/clkmgr_dcm.veo +++ b/rtl/src/ipcore/clkmgr_dcm.veo @@ -54,7 +54,7 @@ // "Output Output Phase Duty Pk-to-Pk Phase" // "Clock Freq (MHz) (degrees) Cycle (%) Jitter (ps) Error (ps)" //---------------------------------------------------------------------------- -// CLK_OUT1____80.000______0.000______50.0______450.000____150.000 +// CLK_OUT1____50.000______0.000______50.0______200.000____150.000 // //---------------------------------------------------------------------------- // "Input Clock Freq (MHz) Input Jitter (UI)" diff --git a/rtl/src/ipcore/clkmgr_dcm.xco b/rtl/src/ipcore/clkmgr_dcm.xco index 06b89ec..37f1a1d 100644 --- a/rtl/src/ipcore/clkmgr_dcm.xco +++ b/rtl/src/ipcore/clkmgr_dcm.xco @@ -1,7 +1,7 @@ ############################################################## # # Xilinx Core Generator version 14.7 -# Date: Wed Jan 28 21:56:02 2015 +# Date: Sun Feb 01 07:49:40 2015 # ############################################################## # @@ -70,7 +70,7 @@ CSET clkin2_jitter_ps=100.0 CSET clkin2_ui_jitter=0.010 CSET clkout1_drives=BUFG CSET clkout1_requested_duty_cycle=50.0 -CSET clkout1_requested_out_freq=80 +CSET clkout1_requested_out_freq=50 CSET clkout1_requested_phase=0.000 CSET clkout2_drives=BUFG CSET clkout2_requested_duty_cycle=50.0 @@ -107,15 +107,15 @@ CSET component_name=clkmgr_dcm CSET daddr_port=DADDR CSET dclk_port=DCLK CSET dcm_clk_feedback=1X -CSET dcm_clk_out1_port=CLKFX +CSET dcm_clk_out1_port=CLK0 CSET dcm_clk_out2_port=CLK0 CSET dcm_clk_out3_port=CLK0 CSET dcm_clk_out4_port=CLK0 CSET dcm_clk_out5_port=CLK0 CSET dcm_clk_out6_port=CLK0 CSET dcm_clkdv_divide=2.0 -CSET dcm_clkfx_divide=5 -CSET dcm_clkfx_multiply=8 +CSET dcm_clkfx_divide=1 +CSET dcm_clkfx_multiply=4 CSET dcm_clkgen_clk_out1_port=CLKFX CSET dcm_clkgen_clk_out2_port=CLKFX CSET dcm_clkgen_clk_out3_port=CLKFX @@ -266,4 +266,4 @@ CSET use_status=false MISC pkg_timestamp=2012-05-10T12:44:55Z # END Extra information GENERATE -# CRC: 9fa2003b +# CRC: d6857c2d diff --git a/rtl/src/ipcore/clkmgr_dcm.xise b/rtl/src/ipcore/clkmgr_dcm.xise index 6ab49ca..e6b0f8a 100644 --- a/rtl/src/ipcore/clkmgr_dcm.xise +++ b/rtl/src/ipcore/clkmgr_dcm.xise @@ -16,11 +16,11 @@ - + - + @@ -28,30 +28,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + diff --git a/rtl/src/ipcore/clkmgr_dcm_flist.txt b/rtl/src/ipcore/clkmgr_dcm_flist.txt index 33943f8..bd1b2cd 100644 --- a/rtl/src/ipcore/clkmgr_dcm_flist.txt +++ b/rtl/src/ipcore/clkmgr_dcm_flist.txt @@ -2,7 +2,6 @@ _xmsgs\pn_parser.xmsgs clkmgr_dcm.asy clkmgr_dcm.gise -clkmgr_dcm.sym clkmgr_dcm.ucf clkmgr_dcm.v clkmgr_dcm.veo -- cgit v1.2.3