Update Quartus Prime version from 19.3.0 to 20.1.0

adi_project_intel.tcl: Change quartus version to 20.1.0.
library: Set qsys version so that IP instances won't require a specific version.
main
stefan.raus 2021-02-25 09:41:57 +00:00 committed by SRaus
parent e2a111d74b
commit 4a772265a9
50 changed files with 76 additions and 87 deletions

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
package require quartus::device
source ../scripts/adi_env.tcl

View File

@ -1,6 +1,6 @@
package require qsys
package require qsys 14.0
package require quartus::device
source ../scripts/adi_env.tcl
source ../scripts/adi_ip_intel.tcl

View File

@ -1,6 +1,6 @@
package require qsys
package require qsys 14.0
package require quartus::device
source ../scripts/adi_env.tcl

View File

@ -1,6 +1,6 @@
package require qsys
package require qsys 14.0
package require quartus::device
source ../scripts/adi_env.tcl

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
package require quartus::device
source ../scripts/adi_env.tcl

View File

@ -1,6 +1,6 @@
package require qsys
package require qsys 14.0
package require quartus::device
source ../scripts/adi_env.tcl

View File

@ -1,6 +1,6 @@
package require qsys
package require qsys 14.0
package require quartus::device
source ../scripts/adi_env.tcl

View File

@ -1,6 +1,6 @@
package require qsys
package require qsys 14.0
package require quartus::device
source ../scripts/adi_env.tcl

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
package require quartus::device
source ../scripts/adi_env.tcl

View File

@ -1,4 +1,4 @@
package require qsys
package require qsys 14.0
package require quartus::device
source ../scripts/adi_env.tcl

View File

@ -1,6 +1,6 @@
package require qsys
package require qsys 14.0
package require quartus::device
source ../scripts/adi_env.tcl

View File

@ -1,6 +1,6 @@
package require qsys
package require qsys 14.0
source ../scripts/adi_env.tcl
source ../scripts/adi_ip_intel.tcl

View File

@ -1,6 +1,6 @@
package require qsys
package require qsys 14.0
package require quartus::device
source ../scripts/adi_env.tcl

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
source ../scripts/adi_env.tcl
source ../scripts/adi_ip_intel.tcl

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
source ../scripts/adi_env.tcl
source ../scripts/adi_ip_intel.tcl

View File

@ -42,7 +42,7 @@
# is copyright © 2016-2017, Analog Devices, Inc.
#
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source ../../scripts/adi_ip_intel.tcl

View File

@ -42,12 +42,10 @@
# is copyright © 2016-2017, Analog Devices, Inc.
#
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source ../../scripts/adi_ip_intel.tcl
set version 19.1
#
# Wrapper module that instantiates and connects all the components required to
# for a JESD204 link.
@ -142,13 +140,12 @@ ad_ip_parameter TPL_DATA_PATH_WIDTH INTEGER 4 false { \
}
proc create_phy_reset_control {tx num_of_lanes sysclk_frequency} {
global version
set device [get_parameter_value DEVICE_FAMILY]
if {[string equal $device "Arria 10"]} {
add_instance phy_reset_control altera_xcvr_reset_control $version
add_instance phy_reset_control altera_xcvr_reset_control
set_instance_property phy_reset_control SUPPRESS_ALL_WARNINGS true
set_instance_parameter_value phy_reset_control {SYNCHRONIZE_RESET} {0}
set_instance_parameter_value phy_reset_control {CHANNELS} $num_of_lanes
@ -177,7 +174,7 @@ proc create_phy_reset_control {tx num_of_lanes sysclk_frequency} {
} elseif {[string equal $device "Stratix 10"]} {
add_instance phy_reset_control altera_xcvr_reset_control_s10 $version
add_instance phy_reset_control altera_xcvr_reset_control_s10
set_instance_parameter_value phy_reset_control {CHANNELS} $num_of_lanes
set_instance_parameter_value phy_reset_control {SYS_CLK_IN_MHZ} $sysclk_frequency
set_instance_parameter_value phy_reset_control {TX_ENABLE} $tx
@ -212,12 +209,10 @@ proc create_phy_reset_control {tx num_of_lanes sysclk_frequency} {
proc create_lane_pll {id tx_or_rx_n pllclk_frequency refclk_frequency num_lanes bonding_clocks_en} {
global version
set device_family [get_parameter_value "DEVICE_FAMILY"]
if {$device_family == "Arria 10"} {
add_instance lane_pll altera_xcvr_atx_pll_a10 $version
add_instance lane_pll altera_xcvr_atx_pll_a10
if {$num_lanes > 6} {
set_instance_parameter_value lane_pll enable_mcgb {true}
if {$bonding_clocks_en} {
@ -229,7 +224,7 @@ proc create_lane_pll {id tx_or_rx_n pllclk_frequency refclk_frequency num_lanes
set_instance_parameter_value lane_pll enable_hfreq_clk {true}
}
add_instance glue adi_jesd204_glue 1.0
add_instance glue adi_jesd204_glue
add_connection phy_reset_control.pll_powerdown glue.in_pll_powerdown
add_connection glue.out_pll_powerdown lane_pll.pll_powerdown
add_connection glue.out_mcgb_rst lane_pll.mcgb_rst
@ -238,11 +233,11 @@ proc create_lane_pll {id tx_or_rx_n pllclk_frequency refclk_frequency num_lanes
}
set_instance_parameter_value lane_pll {enable_pll_reconfig} {1}
} elseif {$device_family == "Stratix 10"} {
add_instance lane_pll altera_xcvr_atx_pll_s10_htile $version
add_instance lane_pll altera_xcvr_atx_pll_s10_htile
set_instance_parameter_value lane_pll {rcfg_enable} {1}
## tie pll_select to GND
add_instance glue adi_jesd204_glue 1.0
add_instance glue adi_jesd204_glue
set_instance_parameter_value glue {IN_PLL_POWERDOWN_EN} {0}
if {$tx_or_rx_n} {
add_connection glue.out_pll_select_gnd phy_reset_control.pll_select
@ -338,8 +333,6 @@ proc jesd204_validate {{quiet false}} {
proc jesd204_compose {} {
global version
set id [get_parameter_value "ID"]
set lane_rate [get_parameter_value "LANE_RATE"]
set tx_or_rx_n [get_parameter_value "TX_OR_RX_N"]
@ -366,7 +359,7 @@ proc jesd204_compose {} {
return
}
add_instance sys_clock clock_source 19.3
add_instance sys_clock clock_source
set_instance_parameter_value sys_clock {clockFrequency} [expr $sysclk_frequency*1000000]
set_instance_parameter_value sys_clock {resetSynchronousEdges} {deassert}
add_interface sys_clk clock sink
@ -374,7 +367,7 @@ proc jesd204_compose {} {
add_interface sys_resetn reset sink
set_interface_property sys_resetn EXPORT_OF sys_clock.clk_in_reset
add_instance ref_clock altera_clock_bridge $version
add_instance ref_clock altera_clock_bridge
set_instance_parameter_value ref_clock {EXPLICIT_CLOCK_RATE} [expr $refclk_frequency*1000000]
set_instance_parameter_value ref_clock {NUM_CLOCK_OUTPUTS} 2
add_interface ref_clk clock sink
@ -385,11 +378,11 @@ proc jesd204_compose {} {
## link clock configuration (also known as device clock, which will be used
## by the upper layers for the data path, it can come from the PCS or external)
add_instance link_clock altera_clock_bridge $version
add_instance link_clock altera_clock_bridge
set_instance_parameter_value link_clock {EXPLICIT_CLOCK_RATE} [expr $linkclk_frequency*1000000]
set_instance_parameter_value link_clock {NUM_CLOCK_OUTPUTS} 2
add_instance link_reset altera_reset_bridge $version
add_instance link_reset altera_reset_bridge
set_instance_parameter_value link_reset {NUM_RESET_OUTPUTS} 2
if {$dual_clk_mode} {
@ -416,7 +409,7 @@ proc jesd204_compose {} {
if {$device_family == "Arria 10"} {
add_instance link_pll altera_xcvr_fpll_a10 $version
add_instance link_pll altera_xcvr_fpll_a10
set_instance_parameter_value link_pll {gui_fpll_mode} {0}
set_instance_parameter_value link_pll {gui_reference_clock_frequency} $refclk_frequency
set_instance_parameter_value link_pll {gui_number_of_output_clocks} 2
@ -428,7 +421,7 @@ proc jesd204_compose {} {
set outclk_name "outclk0"
add_instance link_pll_reset_control altera_xcvr_reset_control $version
add_instance link_pll_reset_control altera_xcvr_reset_control
set_instance_parameter_value link_pll_reset_control {SYNCHRONIZE_RESET} {0}
set_instance_parameter_value link_pll_reset_control {SYS_CLK_IN_MHZ} $sysclk_frequency
set_instance_parameter_value link_pll_reset_control {TX_PLL_ENABLE} {1}
@ -443,7 +436,7 @@ proc jesd204_compose {} {
} elseif {$device_family == "Stratix 10"} {
send_message info "Instantiate a fpll_s10_htile for link_pll."
add_instance link_pll altera_xcvr_fpll_s10_htile 19.1.1
add_instance link_pll altera_xcvr_fpll_s10_htile
## Primary Use is Core mode
set_instance_parameter_value link_pll {set_primary_use} 0
## Basic Mode
@ -479,7 +472,7 @@ proc jesd204_compose {} {
add_connection sys_clock.clk_reset link_pll.reconfig_reset0
add_connection sys_clock.clk link_pll.reconfig_clk0
add_instance axi_xcvr axi_adxcvr 1.0
add_instance axi_xcvr axi_adxcvr
set_instance_parameter_value axi_xcvr {ID} $id
set_instance_parameter_value axi_xcvr {TX_OR_RX_N} $tx_or_rx_n
set_instance_parameter_value axi_xcvr {NUM_OF_LANES} $num_of_lanes
@ -500,7 +493,7 @@ proc jesd204_compose {} {
create_phy_reset_control $tx_or_rx_n $num_of_lanes $sysclk_frequency
add_instance phy jesd204_phy 1.0
add_instance phy jesd204_phy
set_instance_parameter_value phy ID $id
set_instance_parameter_value phy DEVICE $device_family
set_instance_parameter_value phy SOFT_PCS $soft_pcs
@ -519,7 +512,7 @@ proc jesd204_compose {} {
## connect the required device clock
if {$ext_device_clk_en} {
add_instance ext_device_clock altera_clock_bridge $version
add_instance ext_device_clock altera_clock_bridge
set_instance_parameter_value ext_device_clock {EXPLICIT_CLOCK_RATE} [expr $deviceclk_frequency*1000000]
set_instance_parameter_value ext_device_clock {NUM_CLOCK_OUTPUTS} 2
add_interface device_clk clock sink
@ -556,13 +549,13 @@ proc jesd204_compose {} {
add_connection ref_clock.out_clk phy.ref_clk
}
add_instance axi_jesd204_${tx_rx} axi_jesd204_${tx_rx} 1.0
add_instance axi_jesd204_${tx_rx} axi_jesd204_${tx_rx}
set_instance_parameter_value axi_jesd204_${tx_rx} {NUM_LANES} $num_of_lanes
add_connection sys_clock.clk axi_jesd204_${tx_rx}.s_axi_clock
add_connection sys_clock.clk_reset axi_jesd204_${tx_rx}.s_axi_reset
add_instance jesd204_${tx_rx} jesd204_${tx_rx} 1.0
add_instance jesd204_${tx_rx} jesd204_${tx_rx}
set_instance_parameter_value jesd204_${tx_rx} {NUM_LANES} $num_of_lanes
set_instance_parameter_value jesd204_${tx_rx} {ASYNC_CLK} $dual_clk_mode
set_instance_parameter_value jesd204_${tx_rx} {TPL_DATA_PATH_WIDTH} $tpl_data_path_width

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
set_module_property NAME avl_adxcfg
set_module_property DESCRIPTION "Avalon ADXCFG Core"

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source ../../scripts/adi_ip_intel.tcl

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source $ad_hdl_dir/library/scripts/adi_ip_intel.tcl

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source $ad_hdl_dir/library/scripts/adi_ip_intel.tcl

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source ../../scripts/adi_ip_intel.tcl

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
package require quartus::device
source ../../scripts/adi_env.tcl

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
source ../../../scripts/adi_env.tcl
source $ad_hdl_dir/library/scripts/adi_ip_intel.tcl
@ -29,7 +29,7 @@ proc p_intel_mem_asym {} {
set m_size [expr ((2**$m_addr_width_b)*$m_data_width_b)]
}
add_instance intel_mem ram_2port 1.0
add_instance intel_mem ram_2port
set_instance_parameter_value intel_mem {GUI_MODE} 0
set_instance_parameter_value intel_mem {GUI_MEM_IN_BITS} 1
set_instance_parameter_value intel_mem {GUI_MEMSIZE_BITS} $m_size

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
source ../../../scripts/adi_env.tcl
source $ad_hdl_dir/library/scripts/adi_ip_intel.tcl

View File

@ -42,7 +42,7 @@
# is copyright © 2016-2017, Analog Devices, Inc.
#
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source ../../scripts/adi_ip_intel.tcl

View File

@ -42,13 +42,11 @@
# is copyright © 2016-2017, Analog Devices, Inc.
#
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source $ad_hdl_dir/library/scripts/adi_ip_intel.tcl
set version 19.2
#
# Instantiates the Arria 10 native PHY and configures it for JESD204 operation.
# The datapath width is configured for 4 octets per beat.
@ -76,8 +74,6 @@ ad_ip_parameter BONDING_CLOCKS_EN BOOLEAN false false
proc jesd204_phy_composition_callback {} {
global version
set device [get_parameter_value "DEVICE"]
set soft_pcs [get_parameter_value "SOFT_PCS"]
set tx [get_parameter_value "TX_OR_RX_N"]
@ -99,7 +95,7 @@ proc jesd204_phy_composition_callback {} {
set device_type 0
}
add_instance link_clock clock_source 19.3
add_instance link_clock clock_source
set_instance_parameter_value link_clock {clockFrequency} [expr $link_clk_frequency*1000000]
add_interface link_clk clock sink
set_interface_property link_clk EXPORT_OF link_clock.clk_in
@ -108,14 +104,14 @@ proc jesd204_phy_composition_callback {} {
## Arria10
if {$device_type == 1} {
add_instance native_phy altera_xcvr_native_a10 19.1
add_instance native_phy altera_xcvr_native_a10
set_instance_parameter_value native_phy {enh_txfifo_mode} "Phase compensation"
set_instance_parameter_value native_phy {enh_rxfifo_mode} "Phase compensation"
set_instance_property native_phy SUPPRESS_ALL_WARNINGS true
set_instance_property native_phy SUPPRESS_ALL_INFO_MESSAGES true
## Stratix 10
} elseif {$device_type == 2} {
add_instance native_phy altera_xcvr_native_s10_htile $version
add_instance native_phy altera_xcvr_native_s10_htile
set_instance_parameter_value native_phy {tx_fifo_mode} "Phase compensation"
set_instance_parameter_value native_phy {rx_fifo_mode} "Phase compensation"
## Unsupported device
@ -178,7 +174,7 @@ proc jesd204_phy_composition_callback {} {
set_instance_parameter_value native_phy {set_csr_soft_logic_enable} 1
set_instance_parameter_value native_phy {set_prbs_soft_logic_enable} 0
add_instance phy_glue jesd204_phy_glue 1.0
add_instance phy_glue jesd204_phy_glue
set_instance_parameter_value phy_glue DEVICE $device
set_instance_parameter_value phy_glue TX_OR_RX_N $tx
set_instance_parameter_value phy_glue SOFT_PCS $soft_pcs
@ -279,7 +275,7 @@ proc jesd204_phy_composition_callback {} {
if {$tx} {
if {$soft_pcs} {
add_instance soft_pcs_${i} jesd204_soft_pcs_tx 1.0
add_instance soft_pcs_${i} jesd204_soft_pcs_tx
set_instance_parameter_value soft_pcs_${i} INVERT_OUTPUTS \
[expr ($lane_invert >> $i) & 1]
add_connection link_clock.clk soft_pcs_${i}.clock
@ -292,7 +288,7 @@ proc jesd204_phy_composition_callback {} {
}
} else {
if {$soft_pcs} {
add_instance soft_pcs_${i} jesd204_soft_pcs_rx 1.0
add_instance soft_pcs_${i} jesd204_soft_pcs_rx
set_instance_parameter_value soft_pcs_${i} REGISTER_INPUTS $register_inputs
set_instance_parameter_value soft_pcs_${i} INVERT_INPUTS \
[expr ($lane_invert >> $i) & 1]

View File

@ -21,7 +21,7 @@
# ***************************************************************************
# ***************************************************************************
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source ../../scripts/adi_ip_intel.tcl

View File

@ -21,7 +21,7 @@
# ***************************************************************************
# ***************************************************************************
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source ../../scripts/adi_ip_intel.tcl

View File

@ -42,7 +42,7 @@
# is copyright © 2016-2017, Analog Devices, Inc.
#
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source $ad_hdl_dir/library/scripts/adi_ip_intel.tcl

View File

@ -42,7 +42,7 @@
# is copyright © 2016-2017, Analog Devices, Inc.
#
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source $ad_hdl_dir/library/scripts/adi_ip_intel.tcl

View File

@ -42,7 +42,7 @@
# is copyright © 2016-2017, Analog Devices, Inc.
#
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source $ad_hdl_dir/library/scripts/adi_ip_intel.tcl

View File

@ -42,7 +42,7 @@
# is copyright © 2016-2017, Analog Devices, Inc.
#
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source $ad_hdl_dir/library/scripts/adi_ip_intel.tcl

View File

@ -42,7 +42,7 @@
# is copyright © 2016-2017, Analog Devices, Inc.
#
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source $ad_hdl_dir/library/scripts/adi_ip_intel.tcl

View File

@ -42,7 +42,7 @@
# is copyright © 2016-2017, Analog Devices, Inc.
#
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source $ad_hdl_dir/library/scripts/adi_ip_intel.tcl

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source ../../scripts/adi_ip_intel.tcl

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source ../../scripts/adi_ip_intel.tcl

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source ../../scripts/adi_ip_intel.tcl

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source ../../scripts/adi_ip_intel.tcl

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
source ../scripts/adi_env.tcl
source ../scripts/adi_ip_intel.tcl

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
source ../scripts/adi_env.tcl
source ../scripts/adi_ip_intel.tcl

View File

@ -1,6 +1,6 @@
package require qsys
package require qsys 14.0
source ../scripts/adi_env.tcl
source ../scripts/adi_ip_intel.tcl

View File

@ -1,5 +1,5 @@
package require qsys
package require qsys 14.0
source ../scripts/adi_env.tcl
source ../scripts/adi_ip_intel.tcl

View File

@ -21,7 +21,7 @@
# ***************************************************************************
# ***************************************************************************
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source ../../scripts/adi_ip_intel.tcl

View File

@ -21,7 +21,7 @@
# ***************************************************************************
# ***************************************************************************
package require qsys
package require qsys 14.0
source ../../scripts/adi_env.tcl
source ../../scripts/adi_ip_intel.tcl

View File

@ -1,6 +1,6 @@
package require qsys
package require qsys 14.0
source ../scripts/adi_env.tcl
source ../scripts/adi_ip_intel.tcl

View File

@ -1,6 +1,6 @@
package require qsys
package require qsys 14.0
source ../scripts/adi_env.tcl
source ../scripts/adi_ip_intel.tcl

View File

@ -63,10 +63,10 @@ set dac_fifo_address_width [expr int(ceil(log(($dac_fifo_samples_per_converter*$
# JESD204B clock bridges
add_instance tx_device_clk altera_clock_bridge 19.1
add_instance tx_device_clk altera_clock_bridge
set_instance_parameter_value tx_device_clk {EXPLICIT_CLOCK_RATE} {250000000}
add_instance rx_device_clk altera_clock_bridge 19.1
add_instance rx_device_clk altera_clock_bridge
set_instance_parameter_value rx_device_clk {EXPLICIT_CLOCK_RATE} {250000000}
#

View File

@ -5,7 +5,7 @@ proc ad_dacfifo_create {dac_fifo_name dac_data_width dac_dma_data_width dac_fifo
return -code error [format "ERROR: util_dacfifo dac/dma widths must be the same!"]
}
add_instance $dac_fifo_name util_dacfifo 1.0
add_instance $dac_fifo_name util_dacfifo
set_instance_parameter_value $dac_fifo_name {ADDRESS_WIDTH} $dac_fifo_address_width
set_instance_parameter_value $dac_fifo_name {DATA_WIDTH} $dac_data_width

View File

@ -2,7 +2,7 @@
## Initialize global variable
set family "none"
set device "none"
set version "19.3.0"
set version "20.1.0"
## Define the ADI_IGNORE_VERSION_CHECK environment variable to skip version check
if {[info exists ::env(ADI_IGNORE_VERSION_CHECK)]} {