Skip to content

W
White Rabbit core collection
Commit 63d6e85c authored by Dimitris Lampridis's avatar Dimitris Lampridis
Browse files
Options

Merge remote-tracking branch 'origin/fmc-adc-bufg' into proposed_master 

Merge discussed and approved by T. Gingold, needed for new releases of WRTD
reference designs and FMC-ADC-100M.
parents f4748f9e 3884a655
Pipeline #4937 failed with stages
        Hide whitespace changes
        Inline Side-by-side
        Showing with 17 additions and 37 deletions
        board/spec/xwrc_board_spec.vhd
        View file @ 63d6e85c
        ...@@ -313,6 +313,7 @@ architecture struct of xwrc_board_spec is ...@@ -313,6 +313,7 @@ architecture struct of xwrc_board_spec is
        signal ext_ref_mul_stopped : std_logic; signal ext_ref_mul_stopped : std_logic;
        signal ext_ref_rst : std_logic; signal ext_ref_rst : std_logic;
        signal clk_125m_pllref_buf_int1 : std_logic;
        begin -- architecture struct begin -- architecture struct
        ----------------------------------------------------------------------------- -----------------------------------------------------------------------------
        ...@@ -329,6 +330,16 @@ begin -- architecture struct ...@@ -329,6 +330,16 @@ begin -- architecture struct
        I => clk_125m_pllref_p_i, I => clk_125m_pllref_p_i,
        IB => clk_125m_pllref_n_i); IB => clk_125m_pllref_n_i);
        -- The bufg was previously in xwrc_platform_xilinx.
        -- However, it is useless except it helps to fit mapping constraints with
        -- spartan 45t
        -- System PLL input clock buffer
        cmp_clk_sys_buf_i : BUFG
        port map (
        O => clk_125m_pllref_buf_int1,
        I => clk_125m_pllref_buf);
        cmp_xwrc_platform : xwrc_platform_xilinx cmp_xwrc_platform : xwrc_platform_xilinx
        generic map ( generic map (
        g_fpga_family => "spartan6", g_fpga_family => "spartan6",
        ...@@ -341,7 +352,7 @@ begin -- architecture struct ...@@ -341,7 +352,7 @@ begin -- architecture struct
        areset_n_i => areset_n_i, areset_n_i => areset_n_i,
        clk_10m_ext_i => clk_10m_ext_i, clk_10m_ext_i => clk_10m_ext_i,
        clk_20m_vcxo_i => clk_20m_vcxo_i, clk_20m_vcxo_i => clk_20m_vcxo_i,
        clk_125m_pllref_i => clk_125m_pllref_buf, clk_125m_pllref_i => clk_125m_pllref_buf_int1,
        clk_125m_gtp_p_i => clk_125m_gtp_p_i, clk_125m_gtp_p_i => clk_125m_gtp_p_i,
        clk_125m_gtp_n_i => clk_125m_gtp_n_i, clk_125m_gtp_n_i => clk_125m_gtp_n_i,
        sfp_txn_o => sfp_txn_o, sfp_txn_o => sfp_txn_o,
        ......
        platform/xilinx/xwrc_platform_xilinx.vhd
        View file @ 63d6e85c
        ...@@ -256,7 +256,6 @@ begin -- architecture rtl ...@@ -256,7 +256,6 @@ begin -- architecture rtl
        signal clk_20m_vcxo_buf : std_logic; signal clk_20m_vcxo_buf : std_logic;
        signal clk_pll_aux : std_logic_vector(3 downto 0); signal clk_pll_aux : std_logic_vector(3 downto 0);
        signal clk_125m_pllref_buf_int1 : std_logic;
        signal clk_125m_pllref_buf_int2 : std_logic; signal clk_125m_pllref_buf_int2 : std_logic;
        begin --gen_spartan6_default_plls begin --gen_spartan6_default_plls
        ...@@ -306,13 +305,7 @@ begin -- architecture rtl ...@@ -306,13 +305,7 @@ begin -- architecture rtl
        LOCKED => pll_sys_locked, LOCKED => pll_sys_locked,
        RST => pll_arst, RST => pll_arst,
        CLKFBIN => clk_sys_fb, CLKFBIN => clk_sys_fb,
        CLKIN => clk_125m_pllref_buf_int1); CLKIN => clk_125m_pllref_i);
        -- System PLL input clock buffer
        cmp_clk_sys_buf_i : BUFG
        port map (
        O => clk_125m_pllref_buf_int1,
        I => clk_125m_pllref_i);
        -- PLL aux clocks buffers -- PLL aux clocks buffers
        gen_auxclk_bufs: for I in 0 to 3 generate gen_auxclk_bufs: for I in 0 to 3 generate
        ...@@ -372,13 +365,7 @@ begin -- architecture rtl ...@@ -372,13 +365,7 @@ begin -- architecture rtl
        LOCKED => pll_dmtd_locked, LOCKED => pll_dmtd_locked,
        RST => pll_arst, RST => pll_arst,
        CLKFBIN => clk_dmtd_fb, CLKFBIN => clk_dmtd_fb,
        CLKIN => clk_20m_vcxo_buf); CLKIN => clk_20m_vcxo_i);
        -- DMTD PLL input clock buffer
        cmp_clk_dmtd_buf_i : BUFG
        port map (
        O => clk_20m_vcxo_buf,
        I => clk_20m_vcxo_i);
        -- DMTD PLL output clock buffer -- DMTD PLL output clock buffer
        cmp_clk_dmtd_buf_o : BUFG cmp_clk_dmtd_buf_o : BUFG
        ...@@ -413,7 +400,7 @@ begin -- architecture rtl ...@@ -413,7 +400,7 @@ begin -- architecture rtl
        STARTUP_WAIT => FALSE) STARTUP_WAIT => FALSE)
        port map port map
        -- Input clock -- Input clock
        (CLKIN => clk_ext_buf, (CLKIN => clk_10m_ext_i,
        CLKFB => clk_ext_fbi, CLKFB => clk_ext_fbi,
        -- Output clocks -- Output clocks
        CLK0 => clk_ext_fbo, CLK0 => clk_ext_fbo,
        ...@@ -432,12 +419,6 @@ begin -- architecture rtl ...@@ -432,12 +419,6 @@ begin -- architecture rtl
        ext_ref_mul_stopped_o <= clk_ext_stat(1); ext_ref_mul_stopped_o <= clk_ext_stat(1);
        -- External reference input buffer
        cmp_clk_ext_buf_i : BUFG
        port map
        (O => clk_ext_buf,
        I => clk_10m_ext_i);
        clk_10m_ext_o <= clk_ext_buf; clk_10m_ext_o <= clk_ext_buf;
        -- External reference feedback buffer -- External reference feedback buffer
        ...@@ -501,13 +482,7 @@ begin -- architecture rtl ...@@ -501,13 +482,7 @@ begin -- architecture rtl
        LOCKED => pll_sys_locked, LOCKED => pll_sys_locked,
        RST => pll_arst, RST => pll_arst,
        CLKFBIN => clk_sys_fb, CLKFBIN => clk_sys_fb,
        CLKIN => clk_125m_pllref_buf); CLKIN => clk_125m_pllref_i);
        -- System PLL input clock buffer
        cmp_clk_sys_buf_i : BUFG
        port map (
        O => clk_125m_pllref_buf,
        I => clk_125m_pllref_i);
        -- System PLL output clock buffer -- System PLL output clock buffer
        cmp_clk_sys_buf_o : BUFG cmp_clk_sys_buf_o : BUFG
        ...@@ -540,13 +515,7 @@ begin -- architecture rtl ...@@ -540,13 +515,7 @@ begin -- architecture rtl
        LOCKED => pll_dmtd_locked, LOCKED => pll_dmtd_locked,
        RST => pll_arst, RST => pll_arst,
        CLKFBIN => clk_dmtd_fb, CLKFBIN => clk_dmtd_fb,
        CLKIN => clk_20m_vcxo_buf); CLKIN => clk_20m_vcxo_i);
        -- DMTD PLL input clock buffer
        cmp_clk_dmtd_buf_i : BUFG
        port map (
        O => clk_20m_vcxo_buf,
        I => clk_20m_vcxo_i);
        -- DMTD PLL output clock buffer -- DMTD PLL output clock buffer
        cmp_clk_dmtd_buf_o : BUFG cmp_clk_dmtd_buf_o : BUFG
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment