From 7aeeaec5f4ac87587f1866bc935c65024e46a152 Mon Sep 17 00:00:00 2001 From: Adrian Costina Date: Mon, 30 Mar 2015 18:09:57 +0300 Subject: [PATCH] fmcomms1: VC707 updated to the latest framework --- projects/fmcomms1/vc707/system_bd.tcl | 1 + projects/fmcomms1/vc707/system_project.tcl | 4 +- projects/fmcomms1/vc707/system_top.v | 101 +++++++++------------ 3 files changed, 44 insertions(+), 62 deletions(-) diff --git a/projects/fmcomms1/vc707/system_bd.tcl b/projects/fmcomms1/vc707/system_bd.tcl index bd9f26777..1fb76892d 100644 --- a/projects/fmcomms1/vc707/system_bd.tcl +++ b/projects/fmcomms1/vc707/system_bd.tcl @@ -1,4 +1,5 @@ source $ad_hdl_dir/projects/common/vc707/vc707_system_bd.tcl + source $ad_hdl_dir/projects/common/xilinx/sys_wfifo.tcl source ../common/fmcomms1_bd.tcl diff --git a/projects/fmcomms1/vc707/system_project.tcl b/projects/fmcomms1/vc707/system_project.tcl index 44ee1e7d8..9fdf3849b 100644 --- a/projects/fmcomms1/vc707/system_project.tcl +++ b/projects/fmcomms1/vc707/system_project.tcl @@ -1,13 +1,13 @@ - - source ../../scripts/adi_env.tcl source $ad_hdl_dir/projects/scripts/adi_project.tcl +source $ad_hdl_dir/projects/scripts/adi_board.tcl adi_project_create fmcomms1_vc707 adi_project_files fmcomms1_vc707 [list \ "system_top.v" \ "system_constr.xdc"\ + "$ad_hdl_dir/library/common/ad_iobuf.v" \ "$ad_hdl_dir/projects/common/vc707/vc707_system_constr.xdc" ] set_property PROCESSING_ORDER EARLY [get_files $ad_hdl_dir/projects/common/vc707/vc707_system_constr.xdc] diff --git a/projects/fmcomms1/vc707/system_top.v b/projects/fmcomms1/vc707/system_top.v index 997bdf75e..8442ead07 100644 --- a/projects/fmcomms1/vc707/system_top.v +++ b/projects/fmcomms1/vc707/system_top.v @@ -85,8 +85,7 @@ module system_top ( linear_flash_dq_io, gpio_lcd, - gpio_led, - gpio_sw, + gpio_bd, iic_rstn, iic_scl, @@ -109,15 +108,7 @@ module system_top ( adc_data_in_n, ref_clk_out_p, - ref_clk_out_n, - - hdmi_out_clk, - hdmi_hsync, - hdmi_vsync, - hdmi_data_e, - hdmi_data, - - spdif); + ref_clk_out_n ); input sys_rst; input sys_clk_p; @@ -162,9 +153,8 @@ module system_top ( output linear_flash_wen; inout [15:0] linear_flash_dq_io; - output [ 6:0] gpio_lcd; - output [ 7:0] gpio_led; - input [12:0] gpio_sw; + inout [ 6:0] gpio_lcd; + inout [20:0] gpio_bd; output iic_rstn; inout iic_scl; @@ -188,13 +178,6 @@ module system_top ( output ref_clk_out_p; output ref_clk_out_n; - output hdmi_out_clk; - output hdmi_hsync; - output hdmi_vsync; - output hdmi_data_e; - output [35:0] hdmi_data; - - output spdif; // internal registers @@ -207,6 +190,13 @@ module system_top ( // internal signals + wire [63:0] gpio_i; + wire [63:0] gpio_o; + wire [63:0] gpio_t; + wire [ 7:0] spi_csn; + wire spi_clk; + wire spi_mosi; + wire spi_miso; wire dac_clk; wire dac_valid_0; wire dac_enable_0; @@ -222,11 +212,11 @@ module system_top ( wire [15:0] adc_data_1; wire ref_clk; wire oddr_ref_clk; - wire [31:0] mb_intrs; // assignments - assign fan_pwm = 1'b1; + assign fan_pwm = 1'b1; + assign iic_rstn = 1'b1; // instantiations @@ -278,6 +268,12 @@ module system_top ( endcase end + ad_iobuf #(.DATA_WIDTH(21)) i_iobuf_sw_led ( + .dt (gpio_t[20:0]), + .di (gpio_o[20:0]), + .do (gpio_i[20:0]), + .dio(gpio_bd)); + system_wrapper i_system_wrapper ( .ddr3_addr (ddr3_addr), .ddr3_ba (ddr3_ba), @@ -294,20 +290,21 @@ module system_top ( .ddr3_ras_n (ddr3_ras_n), .ddr3_reset_n (ddr3_reset_n), .ddr3_we_n (ddr3_we_n), + .iic_main_scl_io (iic_scl), + .iic_main_sda_io (iic_sda), .linear_flash_addr (linear_flash_addr), .linear_flash_adv_ldn (linear_flash_adv_ldn), .linear_flash_ce_n (linear_flash_ce_n), .linear_flash_oen (linear_flash_oen), .linear_flash_wen (linear_flash_wen), .linear_flash_dq_io(linear_flash_dq_io), - .gpio_lcd_tri_o (gpio_lcd), - .gpio_led_tri_o (gpio_led), - .gpio_sw_tri_i (gpio_sw), - .hdmi_data (hdmi_data), - .hdmi_data_e (hdmi_data_e), - .hdmi_hsync (hdmi_hsync), - .hdmi_out_clk (hdmi_out_clk), - .hdmi_vsync (hdmi_vsync), + .gpio0_i (gpio_i[31:0]), + .gpio0_o (gpio_o[31:0]), + .gpio0_t (gpio_t[31:0]), + .gpio1_i (gpio_i[63:32]), + .gpio1_o (gpio_o[63:32]), + .gpio1_t (gpio_t[63:32]), + .gpio_lcd_tri_io (gpio_lcd), .adc_clk (adc_clk), .adc_clk_in_n (adc_clk_in_n), .adc_clk_in_p (adc_clk_in_p), @@ -315,7 +312,6 @@ module system_top ( .adc_data_1 (adc_data_1), .adc_data_in_n (adc_data_in_n), .adc_data_in_p (adc_data_in_p), - .adc_dma_sync (1'b1), .adc_dma_wdata (adc_dma_wdata), .adc_dma_wr (adc_dma_wr), .adc_enable_0 (adc_enable_0), @@ -342,43 +338,28 @@ module system_top ( .dac_valid_0 (dac_valid_0), .dac_valid_1 (dac_valid_1), .ref_clk (ref_clk), - .iic_main_scl_io (iic_scl), - .iic_main_sda_io (iic_sda), - .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]), - .ad9122_dma_irq (mb_intrs[12]), - .ad9643_dma_irq (mb_intrs[13]), + .mb_intr_06 (1'b0), + .mb_intr_07 (1'b0), + .mb_intr_08 (1'b0), + .mb_intr_14 (1'b0), + .mb_intr_15 (1'b0), .mdio_mdc (mdio_mdc), .mdio_mdio_io (mdio_mdio), .mgt_clk_clk_n (mgt_clk_n), .mgt_clk_clk_p (mgt_clk_p), .phy_rstn (phy_rstn), + .phy_sd (1'b1), .sgmii_rxn (sgmii_rxn), .sgmii_rxp (sgmii_rxp), .sgmii_txn (sgmii_txn), .sgmii_txp (sgmii_txp), - .spdif (spdif), + .spi_clk_i (1'b0), + .spi_clk_o (spi_clk), + .spi_csn_i (8'hff), + .spi_csn_o (spi_csn), + .spi_sdi_i (spi_miso), + .spi_sdo_i (1'b0), + .spi_sdo_o (spi_mosi), .sys_clk_n (sys_clk_n), .sys_clk_p (sys_clk_p), .sys_rst (sys_rst),