From e02d31cdfd6271762ad6d194d5791285c82c57eb Mon Sep 17 00:00:00 2001 From: Iulia Moldovan Date: Tue, 16 Aug 2022 12:32:22 +0100 Subject: [PATCH] scripts: Set required Vivado version only in adi_env.tcl Signed-off-by: Iulia Moldovan --- library/scripts/adi_ip_xilinx.tcl | 17 +---------------- scripts/adi_env.tcl | 8 -------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/library/scripts/adi_ip_xilinx.tcl b/library/scripts/adi_ip_xilinx.tcl index 5d8b24c85..c45172700 100644 --- a/library/scripts/adi_ip_xilinx.tcl +++ b/library/scripts/adi_ip_xilinx.tcl @@ -1,20 +1,5 @@ - source $ad_hdl_dir/library/scripts/adi_xilinx_device_info_enc.tcl - -# check tool version - -set required_vivado_version "2021.2" -if {[info exists ::env(REQUIRED_VIVADO_VERSION)]} { - set required_vivado_version $::env(REQUIRED_VIVADO_VERSION) -} elseif {[info exists REQUIRED_VIVADO_VERSION]} { - set required_vivado_version $REQUIRED_VIVADO_VERSION -} - -if {[info exists ::env(ADI_IGNORE_VERSION_CHECK)]} { - set IGNORE_VERSION_CHECK 1 -} elseif {![info exists IGNORE_VERSION_CHECK]} { - set IGNORE_VERSION_CHECK 0 -} +source $ad_hdl_dir/scripts/adi_env.tcl if {[info exists ::env(ADI_VIVADO_IP_LIBRARY)]} { set VIVADO_IP_LIBRARY $::env(ADI_VIVADO_IP_LIBRARY) diff --git a/scripts/adi_env.tcl b/scripts/adi_env.tcl index 9805116e1..eb3af3bb8 100644 --- a/scripts/adi_env.tcl +++ b/scripts/adi_env.tcl @@ -30,13 +30,6 @@ if {![info exists REQUIRED_QUARTUS_VERSION]} { set REQUIRED_QUARTUS_VERSION "21.2.0" } -# Define the ADI_IGNORE_VERSION_CHECK environment variable to skip version check -if {[info exists ::env(ADI_IGNORE_VERSION_CHECK)]} { - set IGNORE_VERSION_CHECK 1 -} elseif {![info exists IGNORE_VERSION_CHECK]} { - set IGNORE_VERSION_CHECK 0 -} - # This helper pocedure retrieves the value of varible from environment if exists, # other case returns the provided default value # name - name of the environment variable @@ -49,4 +42,3 @@ proc get_env_param {name default_value} { return $default_value } } -