From 766589637e131845a13ffdd2e675b91797143f14 Mon Sep 17 00:00:00 2001 From: Istvan Csomortani Date: Fri, 14 Nov 2014 18:19:37 +0200 Subject: [PATCH] prcfg_zc706: Update data width and project script --- projects/fmcomms2_pr/zc706/system_project.tcl | 15 ++++--- projects/fmcomms2_pr/zc706/system_top.v | 45 ++++++++++++------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/projects/fmcomms2_pr/zc706/system_project.tcl b/projects/fmcomms2_pr/zc706/system_project.tcl index ac35a4284..ea2527b90 100644 --- a/projects/fmcomms2_pr/zc706/system_project.tcl +++ b/projects/fmcomms2_pr/zc706/system_project.tcl @@ -45,6 +45,7 @@ if { $runSynth == 1 } { set prcfg_name "bist" prcfg_synth_reconf $prcfg_name [list "../common/prcfg_system_top.v" \ "${ad_hdl_dir}/library/prcfg/common/prcfg_top.v" \ + "${ad_hdl_dir}/library/common/ad_pnmon.v" \ "${ad_hdl_dir}/library/prcfg/${prcfg_name}/prcfg_dac.v" \ "${ad_hdl_dir}/library/prcfg/${prcfg_name}/prcfg_adc.v"] @@ -52,26 +53,26 @@ if { $runSynth == 1 } { set prcfg_name "qpsk" prcfg_synth_reconf $prcfg_name [list "../common/prcfg_system_top.v" \ "${ad_hdl_dir}/library/prcfg/common/prcfg_top.v" \ + "${ad_hdl_dir}/library/common/ad_pnmon.v" \ "${ad_hdl_dir}/library/prcfg/${prcfg_name}/prcfg_dac.v" \ "${ad_hdl_dir}/library/prcfg/${prcfg_name}/prcfg_adc.v" \ "${ad_hdl_dir}/library/prcfg/${prcfg_name}/qpsk_mod.v" \ "${ad_hdl_dir}/library/prcfg/${prcfg_name}/qpsk_demod.v" \ - "${ad_hdl_dir}/library/prcfg/${prcfg_name}/QPSK_Modulator.v" \ + "${ad_hdl_dir}/library/prcfg/${prcfg_name}/QPSK_Modulator_Baseband.v" \ "${ad_hdl_dir}/library/prcfg/${prcfg_name}/QPSK_Demodulator_Baseband.v" \ "${ad_hdl_dir}/library/prcfg/${prcfg_name}/FIR_Interpolation.v" \ "${ad_hdl_dir}/library/prcfg/${prcfg_name}/FIR_Decimation.v" \ - "${ad_hdl_dir}/library/prcfg/${prcfg_name}/Raised_Cosine_Tx_Filter.v" \ - "${ad_hdl_dir}/library/prcfg/${prcfg_name}/Raised_Cosine_Rx_Filter.v"] + "${ad_hdl_dir}/library/prcfg/${prcfg_name}/Raised_Cosine_Transmit_Filter.v" \ + "${ad_hdl_dir}/library/prcfg/${prcfg_name}/Raised_Cosine_Receive_Filter.v"] } ############################################################################### #### IMPLEMENTATION #### ############################################################################### if { $runImpl == 1 } { - - prcfg_impl "prcfg_constr.xdc" [list "default" \ - "bist" \ - "qpsk"] + prcfg_impl "prcfg_constr.xdc" [list "qpsk" \ + "bist" \ + "default"] } ############################################################################### diff --git a/projects/fmcomms2_pr/zc706/system_top.v b/projects/fmcomms2_pr/zc706/system_top.v index f53f063d9..012ae0e83 100644 --- a/projects/fmcomms2_pr/zc706/system_top.v +++ b/projects/fmcomms2_pr/zc706/system_top.v @@ -170,13 +170,12 @@ module system_top ( wire [48:0] gpio_i; wire [48:0] gpio_o; wire [48:0] gpio_t; - wire [16:0] gpio_wire; wire clk; wire dma_dac_dunf; wire core_dac_dunf; - wire [127:0] dma_dac_ddata; - wire [127:0] core_dac_ddata; + wire [63:0] dma_dac_ddata; + wire [63:0] core_dac_ddata; wire dma_dac_en; wire core_dac_en; wire dma_dac_dvalid; @@ -184,8 +183,8 @@ module system_top ( wire dma_adc_ovf; wire core_adc_ovf; - wire [127:0] dma_adc_ddata; - wire [127:0] core_adc_ddata; + wire [63:0] dma_adc_ddata; + wire [63:0] core_adc_ddata; wire dma_adc_dwr; wire core_adc_dwr; wire dma_adc_dsync; @@ -197,11 +196,13 @@ module system_top ( wire [31:0] dac_gpio_input; wire [31:0] dac_gpio_output; + wire [15:0] ps_intrs; + // instantiations - ad_iobuf #(.DATA_WIDTH(49)) i_iobuf_gpio_ps7 ( - .dt (gpio_t[48:0]), - .di (gpio_o[48:0]), - .do (gpio_i[48:0]), + ad_iobuf #(.DATA_WIDTH(32)) i_iobuf_gpio_ps7 ( + .dt ({gpio_t[48:32],gpio_t[14:0]}), + .di ({gpio_o[48:32],gpio_o[14:0]}), + .do ({gpio_i[48:32],gpio_i[14:0]}), .dio ({ gpio_txnrx, // 48 gpio_enable, // 47 gpio_resetb, // 46 @@ -209,7 +210,6 @@ module system_top ( gpio_en_agc, // 44 gpio_ctl, // 40 gpio_status, // 32 - gpio_wire, // 15 gpio_bd})); // 0 prcfg_system_top i_prcfg_system_top ( @@ -272,7 +272,22 @@ module system_top ( .iic_main_scl_io (iic_scl), .iic_main_sda_io (iic_sda), - + .ps_intr_0 (ps_intrs[0]), + .ps_intr_1 (ps_intrs[1]), + .ps_intr_10 (ps_intrs[10]), + .ps_intr_11 (ps_intrs[11]), + .ps_intr_12 (ps_intrs[12]), + .ps_intr_13 (ps_intrs[13]), + .ps_intr_2 (ps_intrs[2]), + .ps_intr_3 (ps_intrs[3]), + .ps_intr_4 (ps_intrs[4]), + .ps_intr_5 (ps_intrs[5]), + .ps_intr_6 (ps_intrs[6]), + .ps_intr_7 (ps_intrs[7]), + .ps_intr_8 (ps_intrs[8]), + .ps_intr_9 (ps_intrs[9]), + .ad9361_dac_dma_irq (ps_intrs[12]), + .ad9361_adc_dma_irq (ps_intrs[13]), .rx_clk_in_n (rx_clk_in_n), .rx_clk_in_p (rx_clk_in_p), .rx_data_in_n (rx_data_in_n), @@ -333,19 +348,19 @@ endmodule output [31:0] dac_gpio_output, output dma_dac_en, input dma_dac_dunf, - input [127:0] dma_dac_ddata, + input [63:0] dma_dac_ddata, input dma_dac_dvalid, input core_dac_en, output core_dac_dunf, - output [127:0] core_dac_ddata, + output [63:0] core_dac_ddata, output core_dac_dvalid, input core_adc_dwr, input core_adc_dsync, - input [127:0] core_adc_ddata, + input [63:0] core_adc_ddata, output core_adc_ovf, output dma_adc_dwr, output dma_adc_dsync, - output [127:0] dma_adc_ddata, + output [63:0] dma_adc_ddata, input dma_adc_ovf); endmodule