From 83fb5c742aa6ea7ead552fbd241feb167236944e Mon Sep 17 00:00:00 2001 From: Adrian Costina Date: Fri, 9 Oct 2015 13:56:41 +0300 Subject: [PATCH] motcon2_fmc: Updated project to Vivado 2015.2.1 - added cpack cores - removed controller DMA paths --- .../motcon2_fmc/common/motcon2_fmc_bd.tcl | 314 ++++-------------- 1 file changed, 58 insertions(+), 256 deletions(-) diff --git a/projects/motcon2_fmc/common/motcon2_fmc_bd.tcl b/projects/motcon2_fmc/common/motcon2_fmc_bd.tcl index c8e511ef2..7114ce38d 100644 --- a/projects/motcon2_fmc/common/motcon2_fmc_bd.tcl +++ b/projects/motcon2_fmc/common/motcon2_fmc_bd.tcl @@ -70,7 +70,7 @@ # additions to default configuration # Enable additional peripherals from the PS7 block - set_property -dict [list CONFIG.PCW_USE_S_AXI_HP1 {1} ] $sys_ps7 + set_property -dict [list CONFIG.PCW_USE_S_AXI_HP2 {1} ] $sys_ps7 set_property -dict [list CONFIG.PCW_ENET0_ENET0_IO {EMIO} ] $sys_ps7 set_property -dict [list CONFIG.PCW_ENET1_PERIPHERAL_ENABLE {1} ] $sys_ps7 @@ -98,6 +98,7 @@ set_property -dict [list CONFIG.CYCLIC {0}] $speed_detector_m1_dma set_property -dict [list CONFIG.DMA_DATA_WIDTH_DEST {64}] $speed_detector_m1_dma set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {32}] $speed_detector_m1_dma + set_property -dict [list CONFIG.DMA_AXI_PROTOCOL_DEST {0}] $speed_detector_m1_dma # speed detector core motor 2 set speed_detector_m2 [ create_bd_cell -type ip -vlnv analog.com:user:axi_mc_speed:1.0 speed_detector_m2 ] # dma motor 2 @@ -108,6 +109,7 @@ set_property -dict [list CONFIG.CYCLIC {0}] $speed_detector_m2_dma set_property -dict [list CONFIG.DMA_DATA_WIDTH_DEST {64}] $speed_detector_m2_dma set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {32}] $speed_detector_m2_dma + set_property -dict [list CONFIG.DMA_AXI_PROTOCOL_DEST {0}] $speed_detector_m2_dma # current monitor peripherals # current monitor core motor 1 @@ -117,13 +119,12 @@ set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {64}] $current_monitor_m1_dma set_property -dict [list CONFIG.DMA_2D_TRANSFER {0}] $current_monitor_m1_dma set_property -dict [list CONFIG.CYCLIC {0}] $current_monitor_m1_dma + set_property -dict [list CONFIG.DMA_AXI_PROTOCOL_DEST {0}] $current_monitor_m1_dma # data packer motor 1 # - set current_monitor_m1_apack [create_bd_cell -type ip -vlnv analog.com:user:util_adc_pack:1.0 current_monitor_m1_apack] - set_property -dict [list CONFIG.NUM_OF_CHANNELS {4}] $current_monitor_m1_apack -# set current_monitor_m1_pack [ create_bd_cell -type ip -vlnv analog.com:user:util_cpack:1.0 current_monitor_m1_pack ] -# set_property -dict [ list CONFIG.NUM_OF_CHANNELS {4} ] $current_monitor_m1_pack -# set_property -dict [ list CONFIG.CHANNEL_DATA_WIDTH {16} ] $current_monitor_m1_pack + set current_monitor_m1_pack [ create_bd_cell -type ip -vlnv analog.com:user:util_cpack:1.0 current_monitor_m1_pack ] + set_property -dict [ list CONFIG.NUM_OF_CHANNELS {4} ] $current_monitor_m1_pack + set_property -dict [ list CONFIG.CHANNEL_DATA_WIDTH {16} ] $current_monitor_m1_pack # current monitor core motor 2 set current_monitor_m2 [ create_bd_cell -type ip -vlnv analog.com:user:axi_mc_current_monitor:1.0 current_monitor_m2 ] @@ -132,42 +133,17 @@ set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {64}] $current_monitor_m2_dma set_property -dict [list CONFIG.DMA_2D_TRANSFER {0}] $current_monitor_m2_dma set_property -dict [list CONFIG.CYCLIC {0}] $current_monitor_m2_dma + set_property -dict [list CONFIG.DMA_AXI_PROTOCOL_DEST {0}] $current_monitor_m2_dma # data packer motor 2 - set current_monitor_m2_apack [create_bd_cell -type ip -vlnv analog.com:user:util_adc_pack:1.0 current_monitor_m2_apack] - set_property -dict [list CONFIG.NUM_OF_CHANNELS {4}] $current_monitor_m2_apack - #set current_monitor_m2_pack [ create_bd_cell -type ip -vlnv analog.com:user:util_cpack:1.0 current_monitor_m2_pack ] - #set_property -dict [ list CONFIG.NUM_OF_CHANNELS {4} ] $current_monitor_m2_pack - #set_property -dict [ list CONFIG.CHANNEL_DATA_WIDTH {16} ] $current_monitor_m2_pack + set current_monitor_m2_pack [ create_bd_cell -type ip -vlnv analog.com:user:util_cpack:1.0 current_monitor_m2_pack ] + set_property -dict [ list CONFIG.NUM_OF_CHANNELS {4} ] $current_monitor_m2_pack + set_property -dict [ list CONFIG.CHANNEL_DATA_WIDTH {16} ] $current_monitor_m2_pack #controller # controller core motor 1 set controller_m1 [ create_bd_cell -type ip -vlnv analog.com:user:axi_mc_controller:1.0 controller_m1 ] - # dma motor 1 - set controller_m1_dma [ create_bd_cell -type ip -vlnv analog.com:user:axi_dmac:1.0 controller_m1_dma ] - set_property -dict [list CONFIG.DMA_2D_TRANSFER {0}] $controller_m1_dma - set_property -dict [list CONFIG.CYCLIC {0}] $controller_m1_dma - set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {256}] $controller_m1_dma - # data packer motor 1 - set controller_m1_apack [create_bd_cell -type ip -vlnv analog.com:user:util_adc_pack:1.0 controller_m1_apack] - set_property -dict [list CONFIG.NUM_OF_CHANNELS {8}] $controller_m1_apack - set_property -dict [list CONFIG.DATA_WIDTH {32}] $controller_m1_apack - - #set controller_m1_pack [ create_bd_cell -type ip -vlnv analog.com:user:util_cpack:1.0 controller_m1_pack ] - #set_property -dict [ list CONFIG.NUM_OF_CHANNELS {8} ] $controller_m1_pack - #set_property -dict [ list CONFIG.CHANNEL_DATA_WIDTH {32} ] $controller_m1_pack # controller core motor 2 set controller_m2 [ create_bd_cell -type ip -vlnv analog.com:user:axi_mc_controller:1.0 controller_m2 ] - # dma motor 2 - set controller_m2_dma [ create_bd_cell -type ip -vlnv analog.com:user:axi_dmac:1.0 controller_m2_dma ] - set_property -dict [list CONFIG.DMA_2D_TRANSFER {0}] $controller_m2_dma - set_property -dict [list CONFIG.CYCLIC {0}] $controller_m2_dma - set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {256}] $controller_m2_dma - # data packer motor 2 - #set controller_m2_pack [ create_bd_cell -type ip -vlnv analog.com:user:util_cpack:1.0 controller_m2_pack ] - #set_property -dict [ list CONFIG.NUM_OF_CHANNELS {8} ] $controller_m2_pack - set controller_m2_apack [create_bd_cell -type ip -vlnv analog.com:user:util_adc_pack:1.0 controller_m2_apack] - set_property -dict [list CONFIG.NUM_OF_CHANNELS {8}] $controller_m2_apack - set_property -dict [list CONFIG.DATA_WIDTH {32}] $controller_m2_apack #ethernet gmii to rgmii converters # phy 1 @@ -183,10 +159,13 @@ set iic_ee2 [ create_bd_cell -type ip -vlnv xilinx.com:ip:axi_iic:2.0 iic_ee2 ] # xadc - set xadc_core [ create_bd_cell -type ip -vlnv xilinx.com:ip:xadc_wiz:3.0 xadc_core ] + set xadc_core [ create_bd_cell -type ip -vlnv xilinx.com:ip:xadc_wiz:3.1 xadc_core ] set_property -dict [ list CONFIG.XADC_STARUP_SELECTION {simultaneous_sampling} ] $xadc_core - set_property -dict [ list CONFIG.ENABLE_EXTERNAL_MUX {false} ] $xadc_core + set_property -dict [ list CONFIG.ENABLE_EXTERNAL_MUX {true} ] $xadc_core + set_property -dict [ list CONFIG.EXTERNAL_MUX_CHANNEL {VAUXP0_VAUXN0} ] $xadc_core + set_property -dict [ list CONFIG.CHANNEL_ENABLE_VP_VN {false} ] $xadc_core set_property -dict [ list CONFIG.CHANNEL_ENABLE_VAUXP0_VAUXN0 {true} ] $xadc_core + set_property -dict [ list CONFIG.CHANNEL_ENABLE_VAUXP8_VAUXN8 {true} ] $xadc_core set_property -dict [ list CONFIG.OT_ALARM {false} ] $xadc_core set_property -dict [ list CONFIG.USER_TEMP_ALARM {false} ] $xadc_core set_property -dict [ list CONFIG.VCCAUX_ALARM {false} ] $xadc_core @@ -225,38 +204,21 @@ ad_connect adc_m1_ib_dat_i current_monitor_m1/adc_ib_dat_i ad_connect adc_m1_vbus_dat_i current_monitor_m1/adc_vbus_dat_i - ad_connect sys_cpu_clk current_monitor_m1_apack/clk - ad_connect current_monitor_m1/adc_enable_ia current_monitor_m1_apack/chan_enable_0 - ad_connect current_monitor_m1/adc_enable_ib current_monitor_m1_apack/chan_enable_1 - ad_connect current_monitor_m1/adc_enable_vbus current_monitor_m1_apack/chan_enable_2 - ad_connect current_monitor_m1/adc_enable_stub current_monitor_m1_apack/chan_enable_3 - ad_connect current_monitor_m1_apack/chan_valid_0 current_monitor_m1/i_ready_o - ad_connect current_monitor_m1_apack/chan_valid_1 current_monitor_m1/i_ready_o - ad_connect current_monitor_m1_apack/chan_valid_2 current_monitor_m1/i_ready_o - ad_connect current_monitor_m1_apack/chan_valid_3 current_monitor_m1/i_ready_o - ad_connect current_monitor_m1/ia_o current_monitor_m1_apack/chan_data_0 - ad_connect current_monitor_m1/ib_o current_monitor_m1_apack/chan_data_1 - ad_connect current_monitor_m1/vbus_o current_monitor_m1_apack/chan_data_2 - ad_connect current_monitor_m1/vbus_o current_monitor_m1_apack/chan_data_3 - ad_connect current_monitor_m1_apack/ddata current_monitor_m1_dma/fifo_wr_din - ad_connect current_monitor_m1_apack/dvalid current_monitor_m1_dma/fifo_wr_en -# connect_bd_net -net [get_bd_nets sys_100m_clk] [get_bd_pins current_monitor_m1_pack/adc_clk] [get_bd_pins sys_ps7/FCLK_CLK0] -# connect_bd_net -net [get_bd_nets sys_rstgen_peripheral_reset] [get_bd_pins current_monitor_m1_pack/adc_rst] [get_bd_pins sys_rstgen/peripheral_reset] -# connect_bd_net -net current_monitor_m1_adc_enable_ia [get_bd_pins current_monitor_m1/adc_enable_ia] [get_bd_pins current_monitor_m1_pack/adc_enable_0] -# connect_bd_net -net current_monitor_m1_adc_enable_ib [get_bd_pins current_monitor_m1/adc_enable_ib] [get_bd_pins current_monitor_m1_pack/adc_enable_1] -# connect_bd_net -net current_monitor_m1_adc_enable_vbus [get_bd_pins current_monitor_m1/adc_enable_vbus] [get_bd_pins current_monitor_m1_pack/adc_enable_2] -# connect_bd_net -net current_monitor_m1_adc_enable_stub [get_bd_pins current_monitor_m1/adc_enable_stub] [get_bd_pins current_monitor_m1_pack/adc_enable_3] -# connect_bd_net -net current_monitor_m1_i_ready_o [get_bd_pins current_monitor_m1_pack/adc_valid_0] [get_bd_pins current_monitor_m1/i_ready_o] -# connect_bd_net -net current_monitor_m1_i_ready_o [get_bd_pins current_monitor_m1_pack/adc_valid_1] [get_bd_pins current_monitor_m1/i_ready_o] -# connect_bd_net -net current_monitor_m1_i_ready_o [get_bd_pins current_monitor_m1_pack/adc_valid_2] [get_bd_pins current_monitor_m1/i_ready_o] -# connect_bd_net -net current_monitor_m1_i_ready_o [get_bd_pins current_monitor_m1_pack/adc_valid_3] [get_bd_pins current_monitor_m1/i_ready_o] -# connect_bd_net [get_bd_pins current_monitor_m1/ia_o] [get_bd_pins current_monitor_m1_pack/adc_data_0] -# connect_bd_net [get_bd_pins current_monitor_m1/ib_o] [get_bd_pins current_monitor_m1_pack/adc_data_1] -# connect_bd_net [get_bd_pins current_monitor_m1/vbus_o] [get_bd_pins current_monitor_m1_pack/adc_data_2] -# connect_bd_net [get_bd_pins current_monitor_m1/vbus_o] [get_bd_pins current_monitor_m1_pack/adc_data_3] -# connect_bd_net [get_bd_pins current_monitor_m1_pack/adc_data] [get_bd_pins current_monitor_m1_dma/fifo_wr_din] -# connect_bd_net [get_bd_pins current_monitor_m1_pack/adc_valid] [get_bd_pins current_monitor_m1_dma/fifo_wr_en] + ad_connect sys_cpu_clk current_monitor_m1_pack/adc_clk + ad_connect sys_cpu_resetn current_monitor_m1_pack/adc_rst + + ad_connect current_monitor_m1/adc_enable_ia current_monitor_m1_pack/adc_enable_0 + ad_connect current_monitor_m1/adc_enable_ib current_monitor_m1_pack/adc_enable_1 + ad_connect current_monitor_m1/adc_enable_vbus current_monitor_m1_pack/adc_enable_2 + ad_connect current_monitor_m1_pack/adc_valid_0 current_monitor_m1/i_ready_o + ad_connect current_monitor_m1_pack/adc_valid_1 current_monitor_m1/i_ready_o + ad_connect current_monitor_m1_pack/adc_valid_2 current_monitor_m1/i_ready_o + ad_connect current_monitor_m1/ia_o current_monitor_m1_pack/adc_data_0 + ad_connect current_monitor_m1/ib_o current_monitor_m1_pack/adc_data_1 + ad_connect current_monitor_m1/vbus_o current_monitor_m1_pack/adc_data_2 + ad_connect current_monitor_m1_pack/adc_data current_monitor_m1_dma/fifo_wr_din + ad_connect current_monitor_m1_pack/adc_valid current_monitor_m1_dma/fifo_wr_en # motor 2 ad_connect sys_cpu_clk current_monitor_m2/ref_clk @@ -268,45 +230,26 @@ ad_connect adc_m2_ib_dat_i current_monitor_m2/adc_ib_dat_i ad_connect adc_m2_vbus_dat_i current_monitor_m2/adc_vbus_dat_i - ad_connect sys_cpu_clk current_monitor_m2_apack/clk - ad_connect current_monitor_m2/adc_enable_ia current_monitor_m2_apack/chan_enable_0 - ad_connect current_monitor_m2/adc_enable_ib current_monitor_m2_apack/chan_enable_1 - ad_connect current_monitor_m2/adc_enable_vbus current_monitor_m2_apack/chan_enable_2 - ad_connect current_monitor_m2/adc_enable_stub current_monitor_m2_apack/chan_enable_3 - ad_connect current_monitor_m2_apack/chan_valid_0 current_monitor_m2/i_ready_o - ad_connect current_monitor_m2_apack/chan_valid_1 current_monitor_m2/i_ready_o - ad_connect current_monitor_m2_apack/chan_valid_2 current_monitor_m2/i_ready_o - ad_connect current_monitor_m2_apack/chan_valid_3 current_monitor_m2/i_ready_o - ad_connect current_monitor_m2/ia_o current_monitor_m2_apack/chan_data_0 - ad_connect current_monitor_m2/ib_o current_monitor_m2_apack/chan_data_1 - ad_connect current_monitor_m2/vbus_o current_monitor_m2_apack/chan_data_2 - ad_connect current_monitor_m2/vbus_o current_monitor_m2_apack/chan_data_3 - ad_connect current_monitor_m2_apack/ddata current_monitor_m2_dma/fifo_wr_din - ad_connect current_monitor_m2_apack/dvalid current_monitor_m2_dma/fifo_wr_en -# connect_bd_net -net [get_bd_nets sys_100m_clk] [get_bd_pins current_monitor_m2_pack/adc_clk] [get_bd_pins sys_ps7/FCLK_CLK0] -# connect_bd_net -net [get_bd_nets sys_rstgen_peripheral_reset] [get_bd_pins current_monitor_m2_pack/adc_rst] [get_bd_pins sys_rstgen/peripheral_reset] -# connect_bd_net -net current_monitor_m2_adc_enable_ia [get_bd_pins current_monitor_m2/adc_enable_ia] [get_bd_pins current_monitor_m2_pack/adc_enable_0] -# connect_bd_net -net current_monitor_m2_adc_enable_ib [get_bd_pins current_monitor_m2/adc_enable_ib] [get_bd_pins current_monitor_m2_pack/adc_enable_1] -# connect_bd_net -net current_monitor_m2_adc_enable_vbus [get_bd_pins current_monitor_m2/adc_enable_vbus] [get_bd_pins current_monitor_m2_pack/adc_enable_2] -# connect_bd_net -net current_monitor_m2_adc_enable_stub [get_bd_pins current_monitor_m2/adc_enable_stub] [get_bd_pins current_monitor_m2_pack/adc_enable_3] -# connect_bd_net -net current_monitor_m2_i_ready_o [get_bd_pins current_monitor_m2_pack/adc_valid_0] [get_bd_pins current_monitor_m2/i_ready_o] -# connect_bd_net -net current_monitor_m2_i_ready_o [get_bd_pins current_monitor_m2_pack/adc_valid_1] [get_bd_pins current_monitor_m2/i_ready_o] -# connect_bd_net -net current_monitor_m2_i_ready_o [get_bd_pins current_monitor_m2_pack/adc_valid_2] [get_bd_pins current_monitor_m2/i_ready_o] -# connect_bd_net -net current_monitor_m2_i_ready_o [get_bd_pins current_monitor_m2_pack/adc_valid_3] [get_bd_pins current_monitor_m2/i_ready_o] -# connect_bd_net [get_bd_pins current_monitor_m2/ia_o] [get_bd_pins current_monitor_m2_pack/adc_data_0] -# connect_bd_net [get_bd_pins current_monitor_m2/ib_o] [get_bd_pins current_monitor_m2_pack/adc_data_1] -# connect_bd_net [get_bd_pins current_monitor_m2/vbus_o] [get_bd_pins current_monitor_m2_pack/adc_data_2] -# connect_bd_net [get_bd_pins current_monitor_m2/vbus_o] [get_bd_pins current_monitor_m2_pack/adc_data_3] -# connect_bd_net [get_bd_pins current_monitor_m2_pack/adc_valid] [get_bd_pins current_monitor_m2_dma/fifo_wr_en] -# connect_bd_net [get_bd_pins current_monitor_m2_pack/adc_data] [get_bd_pins current_monitor_m2_dma/fifo_wr_din] + ad_connect sys_cpu_clk current_monitor_m2_pack/adc_clk + ad_connect sys_cpu_resetn current_monitor_m2_pack/adc_rst + + ad_connect current_monitor_m2/adc_enable_ia current_monitor_m2_pack/adc_enable_0 + ad_connect current_monitor_m2/adc_enable_ib current_monitor_m2_pack/adc_enable_1 + ad_connect current_monitor_m2/adc_enable_vbus current_monitor_m2_pack/adc_enable_2 + ad_connect current_monitor_m2_pack/adc_valid_0 current_monitor_m2/i_ready_o + ad_connect current_monitor_m2_pack/adc_valid_1 current_monitor_m2/i_ready_o + ad_connect current_monitor_m2_pack/adc_valid_2 current_monitor_m2/i_ready_o + ad_connect current_monitor_m2/ia_o current_monitor_m2_pack/adc_data_0 + ad_connect current_monitor_m2/ib_o current_monitor_m2_pack/adc_data_1 + ad_connect current_monitor_m2/vbus_o current_monitor_m2_pack/adc_data_2 + ad_connect current_monitor_m2_pack/adc_valid current_monitor_m2_dma/fifo_wr_en + ad_connect current_monitor_m2_pack/adc_data current_monitor_m2_dma/fifo_wr_din #controller # motor 1 ad_connect sys_cpu_clk controller_m1/ref_clk ad_connect controller_m1/ctrl_data_clk sys_audio_clkgen/clk_out5 - ad_connect sys_cpu_clk controller_m1_dma/fifo_wr_clk - ad_connect fmc_m1_en_o controller_m1/fmc_en_o ad_connect pwm_m1_al_o controller_m1/pwm_al_o ad_connect pwm_m1_ah_o controller_m1/pwm_ah_o @@ -315,81 +258,13 @@ ad_connect pwm_m1_cl_o controller_m1/pwm_cl_o ad_connect pwm_m1_ch_o controller_m1/pwm_ch_o - ad_connect controller_m1/sensors_o speed_detector_m1/hall_bemf_i - ad_connect controller_m1/position_i speed_detector_m1/position_o - ad_connect controller_m1/ctrl_data_valid_i current_monitor_m1/i_ready_o - - #connect_bd_net -net controller_m1_adc_clk_o [get_bd_pins controller_m1_pack/adc_clk] [get_bd_pins controller_m1/adc_clk_o] - #connect_bd_net -net [get_bd_nets sys_rstgen_peripheral_reset] [get_bd_pins controller_m1_pack/adc_rst] [get_bd_pins sys_rstgen/peripheral_reset] - - #connect_bd_net -net controller_m1_adc_enable_c0 [get_bd_pins controller_m1/adc_enable_c0] [get_bd_pins controller_m1_pack/adc_enable_0] - #connect_bd_net -net controller_m1_adc_enable_c1 [get_bd_pins controller_m1/adc_enable_c1] [get_bd_pins controller_m1_pack/adc_enable_1] - #connect_bd_net -net controller_m1_adc_enable_c2 [get_bd_pins controller_m1/adc_enable_c2] [get_bd_pins controller_m1_pack/adc_enable_2] - #connect_bd_net -net controller_m1_adc_enable_c3 [get_bd_pins controller_m1/adc_enable_c3] [get_bd_pins controller_m1_pack/adc_enable_3] - #connect_bd_net -net controller_m1_adc_enable_c4 [get_bd_pins controller_m1/adc_enable_c4] [get_bd_pins controller_m1_pack/adc_enable_4] - #connect_bd_net -net controller_m1_adc_enable_c5 [get_bd_pins controller_m1/adc_enable_c5] [get_bd_pins controller_m1_pack/adc_enable_5] - #connect_bd_net -net controller_m1_adc_enable_c6 [get_bd_pins controller_m1/adc_enable_c6] [get_bd_pins controller_m1_pack/adc_enable_6] - #connect_bd_net -net controller_m1_adc_enable_c7 [get_bd_pins controller_m1/adc_enable_c7] [get_bd_pins controller_m1_pack/adc_enable_7] - - #connect_bd_net -net controller_m1_adc_valid_c0 [get_bd_pins controller_m1/adc_valid_c0] [get_bd_pins controller_m1_pack/adc_valid_0] - #connect_bd_net -net controller_m1_adc_valid_c1 [get_bd_pins controller_m1/adc_valid_c1] [get_bd_pins controller_m1_pack/adc_valid_1] - #connect_bd_net -net controller_m1_adc_valid_c2 [get_bd_pins controller_m1/adc_valid_c2] [get_bd_pins controller_m1_pack/adc_valid_2] - #connect_bd_net -net controller_m1_adc_valid_c3 [get_bd_pins controller_m1/adc_valid_c3] [get_bd_pins controller_m1_pack/adc_valid_3] - #connect_bd_net -net controller_m1_adc_valid_c4 [get_bd_pins controller_m1/adc_valid_c4] [get_bd_pins controller_m1_pack/adc_valid_4] - #connect_bd_net -net controller_m1_adc_valid_c5 [get_bd_pins controller_m1/adc_valid_c5] [get_bd_pins controller_m1_pack/adc_valid_5] - #connect_bd_net -net controller_m1_adc_valid_c6 [get_bd_pins controller_m1/adc_valid_c6] [get_bd_pins controller_m1_pack/adc_valid_6] - #connect_bd_net -net controller_m1_adc_valid_c7 [get_bd_pins controller_m1/adc_valid_c7] [get_bd_pins controller_m1_pack/adc_valid_7] - - #connect_bd_net -net controller_m1_data_c0 [get_bd_pins controller_m1/adc_data_c0] [get_bd_pins controller_m1_pack/adc_data_0] - #connect_bd_net -net controller_m1_data_c1 [get_bd_pins controller_m1/adc_data_c1] [get_bd_pins controller_m1_pack/adc_data_1] - #connect_bd_net -net controller_m1_data_c2 [get_bd_pins controller_m1/adc_data_c2] [get_bd_pins controller_m1_pack/adc_data_2] - #connect_bd_net -net controller_m1_data_c3 [get_bd_pins controller_m1/adc_data_c3] [get_bd_pins controller_m1_pack/adc_data_3] - #connect_bd_net -net controller_m1_data_c4 [get_bd_pins controller_m1/adc_data_c4] [get_bd_pins controller_m1_pack/adc_data_4] - #connect_bd_net -net controller_m1_data_c5 [get_bd_pins controller_m1/adc_data_c5] [get_bd_pins controller_m1_pack/adc_data_5] - #connect_bd_net -net controller_m1_data_c6 [get_bd_pins controller_m1/adc_data_c6] [get_bd_pins controller_m1_pack/adc_data_6] - #connect_bd_net -net controller_m1_data_c7 [get_bd_pins controller_m1/adc_data_c7] [get_bd_pins controller_m1_pack/adc_data_7] - - #connect_bd_net [get_bd_pins controller_m1_pack/adc_data] [get_bd_pins controller_m1_dma/fifo_wr_din] - #connect_bd_net [get_bd_pins controller_m1_pack/adc_valid] [get_bd_pins controller_m1_dma/fifo_wr_en] - - ad_connect sys_cpu_clk controller_m1_apack/clk - - ad_connect controller_m1/adc_enable_c0 controller_m1_apack/chan_enable_0 - ad_connect controller_m1/adc_enable_c1 controller_m1_apack/chan_enable_1 - ad_connect controller_m1/adc_enable_c2 controller_m1_apack/chan_enable_2 - ad_connect controller_m1/adc_enable_c3 controller_m1_apack/chan_enable_3 - ad_connect controller_m1/adc_enable_c4 controller_m1_apack/chan_enable_4 - ad_connect controller_m1/adc_enable_c5 controller_m1_apack/chan_enable_5 - ad_connect controller_m1/adc_enable_c6 controller_m1_apack/chan_enable_6 - ad_connect controller_m1/adc_enable_c7 controller_m1_apack/chan_enable_7 - - ad_connect controller_m1/adc_valid_c0 controller_m1_apack/chan_valid_0 - ad_connect controller_m1/adc_valid_c1 controller_m1_apack/chan_valid_1 - ad_connect controller_m1/adc_valid_c2 controller_m1_apack/chan_valid_2 - ad_connect controller_m1/adc_valid_c3 controller_m1_apack/chan_valid_3 - ad_connect controller_m1/adc_valid_c4 controller_m1_apack/chan_valid_4 - ad_connect controller_m1/adc_valid_c5 controller_m1_apack/chan_valid_5 - ad_connect controller_m1/adc_valid_c6 controller_m1_apack/chan_valid_6 - ad_connect controller_m1/adc_valid_c7 controller_m1_apack/chan_valid_7 - - ad_connect controller_m1/adc_data_c0 controller_m1_apack/chan_data_0 - ad_connect controller_m1/adc_data_c1 controller_m1_apack/chan_data_1 - ad_connect controller_m1/adc_data_c2 controller_m1_apack/chan_data_2 - ad_connect controller_m1/adc_data_c3 controller_m1_apack/chan_data_3 - ad_connect controller_m1/adc_data_c4 controller_m1_apack/chan_data_4 - ad_connect controller_m1/adc_data_c5 controller_m1_apack/chan_data_5 - ad_connect controller_m1/adc_data_c6 controller_m1_apack/chan_data_6 - ad_connect controller_m1/adc_data_c7 controller_m1_apack/chan_data_7 - - ad_connect controller_m1_apack/ddata controller_m1_dma/fifo_wr_din - ad_connect controller_m1_apack/dvalid controller_m1_dma/fifo_wr_en + ad_connect controller_m1/sensors_o speed_detector_m1/hall_bemf_i + ad_connect controller_m1/position_i speed_detector_m1/position_o # motor 2 ad_connect sys_cpu_clk controller_m2/ref_clk ad_connect controller_m2/ctrl_data_clk sys_audio_clkgen/clk_out5 - ad_connect sys_cpu_clk controller_m2_dma/fifo_wr_clk - ad_connect fmc_m2_en_o controller_m2/fmc_en_o ad_connect pwm_m2_al_o controller_m2/pwm_al_o ad_connect pwm_m2_ah_o controller_m2/pwm_ah_o @@ -398,78 +273,11 @@ ad_connect pwm_m2_cl_o controller_m2/pwm_cl_o ad_connect pwm_m2_ch_o controller_m2/pwm_ch_o - ad_connect controller_m2/sensors_o speed_detector_m2/hall_bemf_i - ad_connect controller_m2/position_i speed_detector_m2/position_o - ad_connect controller_m2/ctrl_data_valid_i current_monitor_m2/i_ready_o - - #connect_bd_net -net controller_m2_adc_clk_o [get_bd_pins controller_m2_pack/adc_clk] [get_bd_pins controller_m2/adc_clk_o] - #connect_bd_net -net [get_bd_nets sys_rstgen_peripheral_reset] [get_bd_pins controller_m2_pack/adc_rst] [get_bd_pins sys_rstgen/peripheral_reset] - - #connect_bd_net -net controller_m2_adc_enable_c0 [get_bd_pins controller_m2/adc_enable_c0] [get_bd_pins controller_m2_pack/adc_enable_0] - #connect_bd_net -net controller_m2_adc_enable_c1 [get_bd_pins controller_m2/adc_enable_c1] [get_bd_pins controller_m2_pack/adc_enable_1] - #connect_bd_net -net controller_m2_adc_enable_c2 [get_bd_pins controller_m2/adc_enable_c2] [get_bd_pins controller_m2_pack/adc_enable_2] - #connect_bd_net -net controller_m2_adc_enable_c3 [get_bd_pins controller_m2/adc_enable_c3] [get_bd_pins controller_m2_pack/adc_enable_3] - #connect_bd_net -net controller_m2_adc_enable_c4 [get_bd_pins controller_m2/adc_enable_c4] [get_bd_pins controller_m2_pack/adc_enable_4] - #connect_bd_net -net controller_m2_adc_enable_c5 [get_bd_pins controller_m2/adc_enable_c5] [get_bd_pins controller_m2_pack/adc_enable_5] - #connect_bd_net -net controller_m2_adc_enable_c6 [get_bd_pins controller_m2/adc_enable_c6] [get_bd_pins controller_m2_pack/adc_enable_6] - #connect_bd_net -net controller_m2_adc_enable_c7 [get_bd_pins controller_m2/adc_enable_c7] [get_bd_pins controller_m2_pack/adc_enable_7] - - #connect_bd_net -net controller_m2_adc_valid_c0 [get_bd_pins controller_m2/adc_valid_c0] [get_bd_pins controller_m2_pack/adc_valid_0] - #connect_bd_net -net controller_m2_adc_valid_c1 [get_bd_pins controller_m2/adc_valid_c1] [get_bd_pins controller_m2_pack/adc_valid_1] - #connect_bd_net -net controller_m2_adc_valid_c2 [get_bd_pins controller_m2/adc_valid_c2] [get_bd_pins controller_m2_pack/adc_valid_2] - #connect_bd_net -net controller_m2_adc_valid_c3 [get_bd_pins controller_m2/adc_valid_c3] [get_bd_pins controller_m2_pack/adc_valid_3] - #connect_bd_net -net controller_m2_adc_valid_c4 [get_bd_pins controller_m2/adc_valid_c4] [get_bd_pins controller_m2_pack/adc_valid_4] - #connect_bd_net -net controller_m2_adc_valid_c5 [get_bd_pins controller_m2/adc_valid_c5] [get_bd_pins controller_m2_pack/adc_valid_5] - #connect_bd_net -net controller_m2_adc_valid_c6 [get_bd_pins controller_m2/adc_valid_c6] [get_bd_pins controller_m2_pack/adc_valid_6] - #connect_bd_net -net controller_m2_adc_valid_c7 [get_bd_pins controller_m2/adc_valid_c7] [get_bd_pins controller_m2_pack/adc_valid_7] - - #connect_bd_net -net controller_m2_data_c0 [get_bd_pins controller_m2/adc_data_c0] [get_bd_pins controller_m2_pack/adc_data_0] - #connect_bd_net -net controller_m2_data_c1 [get_bd_pins controller_m2/adc_data_c1] [get_bd_pins controller_m2_pack/adc_data_1] - #connect_bd_net -net controller_m2_data_c2 [get_bd_pins controller_m2/adc_data_c2] [get_bd_pins controller_m2_pack/adc_data_2] - #connect_bd_net -net controller_m2_data_c3 [get_bd_pins controller_m2/adc_data_c3] [get_bd_pins controller_m2_pack/adc_data_3] - #connect_bd_net -net controller_m2_data_c4 [get_bd_pins controller_m2/adc_data_c4] [get_bd_pins controller_m2_pack/adc_data_4] - #connect_bd_net -net controller_m2_data_c5 [get_bd_pins controller_m2/adc_data_c5] [get_bd_pins controller_m2_pack/adc_data_5] - #connect_bd_net -net controller_m2_data_c6 [get_bd_pins controller_m2/adc_data_c6] [get_bd_pins controller_m2_pack/adc_data_6] - #connect_bd_net -net controller_m2_data_c7 [get_bd_pins controller_m2/adc_data_c7] [get_bd_pins controller_m2_pack/adc_data_7] - - #connect_bd_net [get_bd_pins controller_m2_pack/adc_data] [get_bd_pins controller_m2_dma/fifo_wr_din] - #connect_bd_net [get_bd_pins controller_m2_pack/adc_valid] [get_bd_pins controller_m2_dma/fifo_wr_en] - - ad_connect sys_cpu_clk controller_m2_apack/clk - - ad_connect controller_m2/adc_enable_c0 controller_m2_apack/chan_enable_0 - ad_connect controller_m2/adc_enable_c1 controller_m2_apack/chan_enable_1 - ad_connect controller_m2/adc_enable_c2 controller_m2_apack/chan_enable_2 - ad_connect controller_m2/adc_enable_c3 controller_m2_apack/chan_enable_3 - ad_connect controller_m2/adc_enable_c4 controller_m2_apack/chan_enable_4 - ad_connect controller_m2/adc_enable_c5 controller_m2_apack/chan_enable_5 - ad_connect controller_m2/adc_enable_c6 controller_m2_apack/chan_enable_6 - ad_connect controller_m2/adc_enable_c7 controller_m2_apack/chan_enable_7 - - ad_connect controller_m2/adc_valid_c0 controller_m2_apack/chan_valid_0 - ad_connect controller_m2/adc_valid_c1 controller_m2_apack/chan_valid_1 - ad_connect controller_m2/adc_valid_c2 controller_m2_apack/chan_valid_2 - ad_connect controller_m2/adc_valid_c3 controller_m2_apack/chan_valid_3 - ad_connect controller_m2/adc_valid_c4 controller_m2_apack/chan_valid_4 - ad_connect controller_m2/adc_valid_c5 controller_m2_apack/chan_valid_5 - ad_connect controller_m2/adc_valid_c6 controller_m2_apack/chan_valid_6 - ad_connect controller_m2/adc_valid_c7 controller_m2_apack/chan_valid_7 - - ad_connect controller_m2/adc_data_c0 controller_m2_apack/chan_data_0 - ad_connect controller_m2/adc_data_c1 controller_m2_apack/chan_data_1 - ad_connect controller_m2/adc_data_c2 controller_m2_apack/chan_data_2 - ad_connect controller_m2/adc_data_c3 controller_m2_apack/chan_data_3 - ad_connect controller_m2/adc_data_c4 controller_m2_apack/chan_data_4 - ad_connect controller_m2/adc_data_c5 controller_m2_apack/chan_data_5 - ad_connect controller_m2/adc_data_c6 controller_m2_apack/chan_data_6 - ad_connect controller_m2/adc_data_c7 controller_m2_apack/chan_data_7 - - ad_connect controller_m2_apack/ddata controller_m2_dma/fifo_wr_din - ad_connect controller_m2_apack/dvalid controller_m2_dma/fifo_wr_en + ad_connect controller_m2/sensors_o speed_detector_m2/hall_bemf_i + ad_connect controller_m2/position_i speed_detector_m2/position_o # ethernet - ad_connect sys_200m_clk refclk ad_connect sys_cpu_resetn refclk_rst ad_connect sys_cpu_resetn eth_phy_rst_n @@ -504,7 +312,7 @@ # xadc ad_connect xadc_core/Vaux0 vaux0 ad_connect xadc_core/Vaux8 vaux8 - #connect_bd_net -net xadc_muxout [get_bd_pins /xadc_core/muxaddr_out] [get_bd_ports muxaddr_out] + ad_connect muxaddr_out xadc_core/muxaddr_out # iic ad_connect iic_ee2/IIC iic_ee2 @@ -513,8 +321,7 @@ ad_connect sys_cpu_resetn speed_detector_m2_dma/m_dest_axi_aresetn ad_connect sys_cpu_resetn current_monitor_m1_dma/m_dest_axi_aresetn ad_connect sys_cpu_resetn current_monitor_m2_dma/m_dest_axi_aresetn - ad_connect sys_cpu_resetn controller_m1_dma/m_dest_axi_aresetn - ad_connect sys_cpu_resetn controller_m2_dma/m_dest_axi_aresetn + ad_connect sys_cpu_resetn xadc_core/s_axi_aresetn # address map ad_cpu_interconnect 0x40410000 speed_detector_m1 @@ -525,25 +332,20 @@ ad_cpu_interconnect 0x40460000 controller_m2 ad_cpu_interconnect 0x40510000 speed_detector_m1_dma ad_cpu_interconnect 0x40520000 current_monitor_m1_dma - ad_cpu_interconnect 0x40530000 controller_m1_dma ad_cpu_interconnect 0x40540000 speed_detector_m2_dma ad_cpu_interconnect 0x40550000 current_monitor_m2_dma - ad_cpu_interconnect 0x40560000 controller_m2_dma ad_cpu_interconnect 0x43200000 xadc_core ad_cpu_interconnect 0x41510000 iic_ee2 - ad_mem_hp1_interconnect sys_cpu_clk sys_ps7/S_AXI_HP1 - ad_mem_hp1_interconnect sys_cpu_clk speed_detector_m1_dma/m_dest_axi - ad_mem_hp1_interconnect sys_cpu_clk speed_detector_m2_dma/m_dest_axi - ad_mem_hp1_interconnect sys_cpu_clk current_monitor_m1_dma/m_dest_axi - ad_mem_hp1_interconnect sys_cpu_clk current_monitor_m2_dma/m_dest_axi - ad_mem_hp1_interconnect sys_cpu_clk controller_m1_dma/m_dest_axi - ad_mem_hp1_interconnect sys_cpu_clk controller_m2_dma/m_dest_axi + ad_mem_hp2_interconnect sys_cpu_clk sys_ps7/S_AXI_HP2 + ad_mem_hp2_interconnect sys_cpu_clk speed_detector_m1_dma/m_dest_axi + ad_mem_hp2_interconnect sys_cpu_clk speed_detector_m2_dma/m_dest_axi + ad_mem_hp2_interconnect sys_cpu_clk current_monitor_m1_dma/m_dest_axi + ad_mem_hp2_interconnect sys_cpu_clk current_monitor_m2_dma/m_dest_axi - ad_cpu_interrupt ps-6 mb-6 controller_m2_dma/irq - ad_cpu_interrupt ps-7 mb-7 current_monitor_m2_dma/irq - ad_cpu_interrupt ps-8 mb-8 speed_detector_m2_dma/irq - ad_cpu_interrupt ps-9 mb-9 controller_m1_dma/irq + ad_cpu_interrupt ps-7 mb-7 xadc_core/ip2intc_irpt + ad_cpu_interrupt ps-8 mb-8 current_monitor_m2_dma/irq + ad_cpu_interrupt ps-9 mb-9 speed_detector_m2_dma/irq ad_cpu_interrupt ps-10 mb-10 current_monitor_m1_dma/irq ad_cpu_interrupt ps-12 mb-12 iic_ee2/iic2intc_irpt ad_cpu_interrupt ps-13 mb-13 speed_detector_m1_dma/irq