fmcomms2: Updated kc705 project to vivado 2014.2.

- Updated interrupt system to the latest implementation
- Fixed constraints
- Used ad_iobuf
main
Adrian Costina 2014-11-07 13:58:40 +02:00
parent db18ed4af2
commit 962df53946
3 changed files with 61 additions and 75 deletions

View File

@ -60,8 +60,5 @@ set_property -dict {PACKAGE_PIN AJ29 IOSTANDARD LVCMOS25} [get_ports spi_miso
# clocks # clocks
create_clock -name rx_clk -period 5 [get_ports rx_clk_in_p] create_clock -name rx_clk -period 4 [get_ports rx_clk_in_p]
create_clock -name ad9361_clk -period 5 [get_pins i_system_wrapper/system_i/axi_ad9361/clk] create_clock -name ad9361_clk -period 4 [get_pins i_system_wrapper/system_i/axi_ad9361/clk]
set_clock_groups -asynchronous -group {ad9361_clk}

View File

@ -8,6 +8,7 @@ adi_project_create fmcomms2_kc705
adi_project_files fmcomms2_kc705 [list \ adi_project_files fmcomms2_kc705 [list \
"system_top.v" \ "system_top.v" \
"system_constr.xdc"\ "system_constr.xdc"\
"$ad_hdl_dir/library/common/ad_iobuf.v" \
"$ad_hdl_dir/projects/common/kc705/kc705_system_constr.xdc" ] "$ad_hdl_dir/projects/common/kc705/kc705_system_constr.xdc" ]
adi_project_run fmcomms2_kc705 adi_project_run fmcomms2_kc705

View File

@ -1,9 +1,9 @@
// *************************************************************************** // ***************************************************************************
// *************************************************************************** // ***************************************************************************
// Copyright 2011(c) Analog Devices, Inc. // Copyright 2011(c) Analog Devices, Inc.
// //
// All rights reserved. // All rights reserved.
// //
// Redistribution and use in source and binary forms, with or without modification, // Redistribution and use in source and binary forms, with or without modification,
// are permitted provided that the following conditions are met: // are permitted provided that the following conditions are met:
// - Redistributions of source code must retain the above copyright // - Redistributions of source code must retain the above copyright
@ -21,16 +21,16 @@
// patent holders to use this software. // patent holders to use this software.
// - Use of the software either in source or binary form, must be run // - Use of the software either in source or binary form, must be run
// on or directly connected to an Analog Devices Inc. component. // on or directly connected to an Analog Devices Inc. component.
// //
// THIS SOFTWARE IS PROVIDED BY ANALOG DEVICES "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, // THIS SOFTWARE IS PROVIDED BY ANALOG DEVICES "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
// INCLUDING, BUT NOT LIMITED TO, NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A // INCLUDING, BUT NOT LIMITED TO, NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A
// PARTICULAR PURPOSE ARE DISCLAIMED. // PARTICULAR PURPOSE ARE DISCLAIMED.
// //
// IN NO EVENT SHALL ANALOG DEVICES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, // IN NO EVENT SHALL ANALOG DEVICES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, INTELLECTUAL PROPERTY // EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, INTELLECTUAL PROPERTY
// RIGHTS, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR // RIGHTS, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
// BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, // BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// *************************************************************************** // ***************************************************************************
// *************************************************************************** // ***************************************************************************
@ -96,21 +96,21 @@ module system_top (
hdmi_data, hdmi_data,
spdif, spdif,
rx_clk_in_p, rx_clk_in_p,
rx_clk_in_n, rx_clk_in_n,
rx_frame_in_p, rx_frame_in_p,
rx_frame_in_n, rx_frame_in_n,
rx_data_in_p, rx_data_in_p,
rx_data_in_n, rx_data_in_n,
tx_clk_out_p, tx_clk_out_p,
tx_clk_out_n, tx_clk_out_n,
tx_frame_out_p, tx_frame_out_p,
tx_frame_out_n, tx_frame_out_n,
tx_data_out_p, tx_data_out_p,
tx_data_out_n, tx_data_out_n,
gpio_txnrx, gpio_txnrx,
gpio_enable, gpio_enable,
gpio_resetb, gpio_resetb,
@ -122,7 +122,7 @@ module system_top (
spi_csn, spi_csn,
spi_clk, spi_clk,
spi_mosi, spi_mosi,
spi_miso spi_miso
); );
input sys_rst; input sys_rst;
@ -180,14 +180,14 @@ module system_top (
output [15:0] hdmi_data; output [15:0] hdmi_data;
output spdif; output spdif;
input rx_clk_in_p; input rx_clk_in_p;
input rx_clk_in_n; input rx_clk_in_n;
input rx_frame_in_p; input rx_frame_in_p;
input rx_frame_in_n; input rx_frame_in_n;
input [ 5:0] rx_data_in_p; input [ 5:0] rx_data_in_p;
input [ 5:0] rx_data_in_n; input [ 5:0] rx_data_in_n;
output tx_clk_out_p; output tx_clk_out_p;
output tx_clk_out_n; output tx_clk_out_n;
output tx_frame_out_p; output tx_frame_out_p;
@ -202,67 +202,31 @@ module system_top (
inout gpio_en_agc; inout gpio_en_agc;
inout [ 3:0] gpio_ctl; inout [ 3:0] gpio_ctl;
inout [ 7:0] gpio_status; inout [ 7:0] gpio_status;
output spi_csn; output spi_csn;
output spi_clk; output spi_clk;
output spi_mosi; output spi_mosi;
input spi_miso; input spi_miso;
// internal signals // internal signals
wire [16:0] gpio_i; wire [16:0] gpio_i;
wire [16:0] gpio_o; wire [16:0] gpio_o;
wire [16:0] gpio_t; wire [16:0] gpio_t;
wire [31:0] mb_intrs;
// instantiations // instantiations
IOBUF i_iobuf_gpio_txnrx (
.I (gpio_o[16]),
.O (gpio_i[16]),
.T (gpio_t[16]),
.IO (gpio_txnrx));
IOBUF i_iobuf_gpio_enable ( ad_iobuf #(.DATA_WIDTH(17)) i_iobuf (
.I (gpio_o[15]), .dt (gpio_t[16:0]),
.O (gpio_i[15]), .di (gpio_o[16:0]),
.T (gpio_t[15]), .do (gpio_i[16:0]),
.IO (gpio_enable)); .dio({ gpio_txnrx,
gpio_enable,
IOBUF i_iobuf_gpio_resetb ( gpio_resetb,
.I (gpio_o[14]), gpio_sync,
.O (gpio_i[14]), gpio_en_agc,
.T (gpio_t[14]), gpio_ctl,
.IO (gpio_resetb)); gpio_status}));
IOBUF i_iobuf_gpio_sync (
.I (gpio_o[13]),
.O (gpio_i[13]),
.T (gpio_t[13]),
.IO (gpio_sync));
IOBUF i_iobuf_gpio_en_agc (
.I (gpio_o[12]),
.O (gpio_i[12]),
.T (gpio_t[12]),
.IO (gpio_en_agc));
genvar n;
generate
for (n = 0; n <= 3; n = n + 1) begin: g_iobuf_gpio_ctl
IOBUF i_iobuf_gpio_ctl (
.I (gpio_o[8+n]),
.O (gpio_i[8+n]),
.T (gpio_t[8+n]),
.IO (gpio_ctl[n]));
end
for (n = 0; n <= 7; n = n + 1) begin: g_iobuf_gpio_status
IOBUF i_iobuf_gpio_status (
.I (gpio_o[0+n]),
.O (gpio_i[0+n]),
.T (gpio_t[0+n]),
.IO (gpio_status[n]));
end
endgenerate
system_wrapper i_system_wrapper ( system_wrapper i_system_wrapper (
.ddr3_1_n (ddr3_1_n), .ddr3_1_n (ddr3_1_n),
@ -297,6 +261,32 @@ module system_top (
.iic_main_scl_io (iic_scl), .iic_main_scl_io (iic_scl),
.iic_main_sda_io (iic_sda), .iic_main_sda_io (iic_sda),
.iic_rstn (iic_rstn), .iic_rstn (iic_rstn),
.mb_intr_10 (mb_intrs[10]),
.mb_intr_11 (mb_intrs[11]),
.mb_intr_12 (mb_intrs[12]),
.mb_intr_13 (mb_intrs[13]),
.mb_intr_14 (mb_intrs[14]),
.mb_intr_15 (mb_intrs[15]),
.mb_intr_16 (mb_intrs[16]),
.mb_intr_17 (mb_intrs[17]),
.mb_intr_18 (mb_intrs[18]),
.mb_intr_19 (mb_intrs[19]),
.mb_intr_20 (mb_intrs[20]),
.mb_intr_21 (mb_intrs[21]),
.mb_intr_22 (mb_intrs[22]),
.mb_intr_23 (mb_intrs[23]),
.mb_intr_24 (mb_intrs[24]),
.mb_intr_25 (mb_intrs[25]),
.mb_intr_26 (mb_intrs[26]),
.mb_intr_27 (mb_intrs[27]),
.mb_intr_28 (mb_intrs[28]),
.mb_intr_29 (mb_intrs[29]),
.mb_intr_30 (mb_intrs[30]),
.mb_intr_31 (mb_intrs[31]),
.fmcomms2_spi_irq(mb_intrs[10]),
.fmcomms2_gpio_irq(mb_intrs[11]),
.ad9361_adc_dma_irq (mb_intrs[12]),
.ad9361_dac_dma_irq (mb_intrs[13]),
.mdio_mdc (mdio_mdc), .mdio_mdc (mdio_mdc),
.mdio_mdio_io (mdio_mdio_io), .mdio_mdio_io (mdio_mdio_io),
.mii_col (mii_col), .mii_col (mii_col),
@ -314,7 +304,7 @@ module system_top (
.sys_clk_p (sys_clk_p), .sys_clk_p (sys_clk_p),
.sys_rst (sys_rst), .sys_rst (sys_rst),
.spi_csn_i (1'b1), .spi_csn_i (1'b1),
.spi_csn_o (spi_csn), .spi_csn_o (spi_csn),
.spi_miso_i (spi_miso), .spi_miso_i (spi_miso),
.spi_mosi_i (1'b0), .spi_mosi_i (1'b0),
.spi_mosi_o (spi_mosi), .spi_mosi_o (spi_mosi),
@ -325,17 +315,15 @@ module system_top (
.rx_data_in_n (rx_data_in_n), .rx_data_in_n (rx_data_in_n),
.rx_data_in_p (rx_data_in_p), .rx_data_in_p (rx_data_in_p),
.rx_frame_in_n (rx_frame_in_n), .rx_frame_in_n (rx_frame_in_n),
.rx_frame_in_p (rx_frame_in_p), .rx_frame_in_p (rx_frame_in_p),
.tx_clk_out_n (tx_clk_out_n), .tx_clk_out_n (tx_clk_out_n),
.tx_clk_out_p (tx_clk_out_p), .tx_clk_out_p (tx_clk_out_p),
.tx_data_out_n (tx_data_out_n), .tx_data_out_n (tx_data_out_n),
.tx_data_out_p (tx_data_out_p), .tx_data_out_p (tx_data_out_p),
.tx_frame_out_n (tx_frame_out_n), .tx_frame_out_n (tx_frame_out_n),
.tx_frame_out_p (tx_frame_out_p), .tx_frame_out_p (tx_frame_out_p),
.uart_sin (uart_sin), .uart_sin (uart_sin),
.uart_sout (uart_sout), .uart_sout (uart_sout));
.unc_int0 (1'b0),
.unc_int3 (1'b0));
endmodule endmodule