From 74ad0d1e4612198664dec6aee768eec36904fa36 Mon Sep 17 00:00:00 2001 From: AndreiGrozav Date: Wed, 15 Nov 2017 17:08:45 +0200 Subject: [PATCH] library: Update Older Vivado versions where incorrectly inferring interfaces -axi_ad9361 -axi_ad9963 -axi_adc_decimate -axi_adc_trigger -axi_clkgen -axi_dac_interpolate -axi_hdmi_tx -axi_i2s_adi -axi_logic_analyzer -spi_engine --- library/axi_ad9361/axi_ad9361_ip.tcl | 5 ----- library/axi_ad9963/axi_ad9963_ip.tcl | 4 ---- library/axi_adc_decimate/axi_adc_decimate_ip.tcl | 1 - library/axi_adc_trigger/axi_adc_trigger_ip.tcl | 1 - library/axi_clkgen/axi_clkgen_ip.tcl | 1 - library/axi_dac_interpolate/axi_dac_interpolate_ip.tcl | 1 - library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl | 3 --- library/axi_i2s_adi/axi_i2s_adi_ip.tcl | 6 ------ library/axi_logic_analyzer/axi_logic_analyzer_ip.tcl | 1 - library/spi_engine/axi_spi_engine/axi_spi_engine_ip.tcl | 4 ---- 10 files changed, 27 deletions(-) diff --git a/library/axi_ad9361/axi_ad9361_ip.tcl b/library/axi_ad9361/axi_ad9361_ip.tcl index 6d27e2328..e10f945ee 100644 --- a/library/axi_ad9361/axi_ad9361_ip.tcl +++ b/library/axi_ad9361/axi_ad9361_ip.tcl @@ -81,11 +81,6 @@ set_property enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CMOS_OR_L [ipx::get_ports tx_frame_out -of_objects [ipx::current_core]] \ [ipx::get_ports tx_data_out -of_objects [ipx::current_core]] -ipx::remove_bus_interface rst [ipx::current_core] -ipx::remove_bus_interface clk [ipx::current_core] -ipx::remove_bus_interface l_clk [ipx::current_core] -ipx::remove_bus_interface delay_clk [ipx::current_core] - ipx::add_bus_parameter ASSOCIATED_BUSIF [ipx::get_bus_interfaces s_axi_aclk \ -of_objects [ipx::current_core]] set_property value s_axi [ipx::get_bus_parameters ASSOCIATED_BUSIF \ diff --git a/library/axi_ad9963/axi_ad9963_ip.tcl b/library/axi_ad9963/axi_ad9963_ip.tcl index ded2567b8..674025c85 100644 --- a/library/axi_ad9963/axi_ad9963_ip.tcl +++ b/library/axi_ad9963/axi_ad9963_ip.tcl @@ -43,10 +43,6 @@ set_property driver_value 0 [ipx::get_ports *dac_sync_in* -of_objects [ipx::curr set_property driver_value 0 [ipx::get_ports *dovf* -of_objects [ipx::current_core]] set_property driver_value 0 [ipx::get_ports *dunf* -of_objects [ipx::current_core]] -ipx::remove_bus_interface rst [ipx::current_core] -ipx::remove_bus_interface clk [ipx::current_core] -ipx::remove_bus_interface delay_clk [ipx::current_core] - ipx::add_bus_parameter ASSOCIATED_BUSIF [ipx::get_bus_interfaces s_axi_aclk \ -of_objects [ipx::current_core]] set_property value s_axi [ipx::get_bus_parameters ASSOCIATED_BUSIF \ diff --git a/library/axi_adc_decimate/axi_adc_decimate_ip.tcl b/library/axi_adc_decimate/axi_adc_decimate_ip.tcl index 927f37969..6637881b4 100644 --- a/library/axi_adc_decimate/axi_adc_decimate_ip.tcl +++ b/library/axi_adc_decimate/axi_adc_decimate_ip.tcl @@ -21,7 +21,6 @@ adi_ip_add_core_dependencies { \ analog.com:user:util_cic:1.0 \ } -ipx::remove_bus_interface {clk} [ipx::current_core] ipx::associate_bus_interfaces -busif s_axi -clock s_axi_aclk [ipx::current_core] ipx::save_core [ipx::current_core] diff --git a/library/axi_adc_trigger/axi_adc_trigger_ip.tcl b/library/axi_adc_trigger/axi_adc_trigger_ip.tcl index 02b7c9d75..b4b0309be 100644 --- a/library/axi_adc_trigger/axi_adc_trigger_ip.tcl +++ b/library/axi_adc_trigger/axi_adc_trigger_ip.tcl @@ -13,7 +13,6 @@ adi_ip_files axi_adc_trigger [list \ adi_ip_properties axi_adc_trigger -ipx::remove_bus_interface {clk} [ipx::current_core] ipx::associate_bus_interfaces -busif s_axi -clock s_axi_aclk [ipx::current_core] ipx::save_core [ipx::current_core] diff --git a/library/axi_clkgen/axi_clkgen_ip.tcl b/library/axi_clkgen/axi_clkgen_ip.tcl index 4ca6d18b2..79d3d4d20 100644 --- a/library/axi_clkgen/axi_clkgen_ip.tcl +++ b/library/axi_clkgen/axi_clkgen_ip.tcl @@ -16,7 +16,6 @@ adi_ip_files axi_clkgen [list \ adi_ip_properties axi_clkgen adi_ip_bd axi_clkgen "bd/bd.tcl" -ipx::remove_bus_interface {clk} [ipx::current_core] ipx::associate_bus_interfaces -busif s_axi -clock s_axi_aclk [ipx::current_core] ipx::infer_bus_interface clk xilinx.com:signal:clock_rtl:1.0 [ipx::current_core] diff --git a/library/axi_dac_interpolate/axi_dac_interpolate_ip.tcl b/library/axi_dac_interpolate/axi_dac_interpolate_ip.tcl index 9cbfa34d2..55c3080c7 100644 --- a/library/axi_dac_interpolate/axi_dac_interpolate_ip.tcl +++ b/library/axi_dac_interpolate/axi_dac_interpolate_ip.tcl @@ -18,7 +18,6 @@ adi_ip_files axi_dac_interpolate [list \ adi_ip_properties axi_dac_interpolate -ipx::remove_bus_interface {clk} [ipx::current_core] ipx::associate_bus_interfaces -busif s_axi -clock s_axi_aclk [ipx::current_core] ipx::save_core [ipx::current_core] diff --git a/library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl b/library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl index 30c5ca48c..b67f8dc57 100644 --- a/library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl +++ b/library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl @@ -29,8 +29,5 @@ adi_ip_files axi_hdmi_tx [list \ adi_ip_properties axi_hdmi_tx -ipx::remove_bus_interface hdmi_clk [ipx::current_core] -ipx::remove_bus_interface hdmi_out_clk [ipx::current_core] -ipx::remove_bus_interface vdma_clk [ipx::current_core] ipx::save_core [ipx::current_core] diff --git a/library/axi_i2s_adi/axi_i2s_adi_ip.tcl b/library/axi_i2s_adi/axi_i2s_adi_ip.tcl index 8fcf81ae8..015cb8cc9 100644 --- a/library/axi_i2s_adi/axi_i2s_adi_ip.tcl +++ b/library/axi_i2s_adi/axi_i2s_adi_ip.tcl @@ -102,11 +102,5 @@ ipx::associate_bus_interfaces -clock s_axi_aclk -reset s_axis_aresetn -clear [ip # Tie-off optional inputs to 0 set_property driver_value 0 [ipx::get_ports -filter "direction==in && enablement_dependency!={}" -of_objects [ipx::current_core]] -# Incorrectly inferred interfaces -ipx::remove_bus_interface dma_req_tx_rstn [ipx::current_core] -ipx::remove_bus_interface dma_req_rx_rstn [ipx::current_core] -ipx::remove_bus_interface dma_req_tx_aclk [ipx::current_core] -ipx::remove_bus_interface dma_req_rx_aclk [ipx::current_core] - ipx::save_core [ipx::current_core] diff --git a/library/axi_logic_analyzer/axi_logic_analyzer_ip.tcl b/library/axi_logic_analyzer/axi_logic_analyzer_ip.tcl index 7706cd178..31d55f0fb 100644 --- a/library/axi_logic_analyzer/axi_logic_analyzer_ip.tcl +++ b/library/axi_logic_analyzer/axi_logic_analyzer_ip.tcl @@ -16,7 +16,6 @@ adi_ip_files axi_logic_analyzer [list \ adi_ip_properties axi_logic_analyzer -ipx::remove_bus_interface {clk} [ipx::current_core] ipx::associate_bus_interfaces -busif s_axi -clock s_axi_aclk [ipx::current_core] ipx::save_core [ipx::current_core] diff --git a/library/spi_engine/axi_spi_engine/axi_spi_engine_ip.tcl b/library/spi_engine/axi_spi_engine/axi_spi_engine_ip.tcl index f6f698212..34eb54690 100644 --- a/library/spi_engine/axi_spi_engine/axi_spi_engine_ip.tcl +++ b/library/spi_engine/axi_spi_engine/axi_spi_engine_ip.tcl @@ -11,10 +11,6 @@ adi_ip_files axi_spi_engine [list \ ] adi_ip_properties axi_spi_engine -# Remove auto inferred interfaces -ipx::remove_bus_interface offload0_mem_signal_reset [ipx::current_core] -ipx::remove_bus_interface spi_signal_clock [ipx::current_core] -ipx::remove_bus_interface spi_signal_reset [ipx::current_core] adi_ip_add_core_dependencies { \ analog.com:user:util_axis_fifo:1.0 \