From 061824833c00c89844a246dedc3142d468333ae9 Mon Sep 17 00:00:00 2001 From: Bogdan Luncan Date: Mon, 31 Oct 2022 12:16:32 +0000 Subject: [PATCH] Added logging of make params to the sysid memory Signed-off-by: Bogdan Luncan --- projects/ad40xx_fmc/zed/system_bd.tcl | 14 +++++--- projects/ad4110/zed/system_bd.tcl | 2 +- projects/ad4134_fmc/zed/system_bd.tcl | 2 +- projects/ad4630_fmc/zed/system_bd.tcl | 11 +++--- projects/ad469x_fmc/zed/system_bd.tcl | 12 +++++-- projects/ad5758_sdz/zed/system_bd.tcl | 5 +-- projects/ad5766_sdz/zed/system_bd.tcl | 5 +-- projects/ad6676evb/vc707/system_bd.tcl | 8 ++--- projects/ad6676evb/zc706/system_bd.tcl | 8 ++--- projects/ad7134_fmc/zed/system_bd.tcl | 4 +-- projects/ad719x_asdz/coraz7s/system_bd.tcl | 3 +- projects/ad738x_fmc/zed/system_bd.tcl | 21 ++++++------ projects/ad7405_fmc/zed/system_bd.tcl | 22 ++++++------ projects/ad7606x_fmc/zed/system_bd.tcl | 7 ++-- projects/ad7616_sdz/zc706/system_bd.tcl | 13 +++---- projects/ad7616_sdz/zed/system_bd.tcl | 13 +++---- projects/ad77681evb/zed/system_bd.tcl | 5 +-- projects/ad7768evb/zed/system_bd.tcl | 4 +-- projects/ad777x_ardz/de10nano/system_qsys.tcl | 4 +-- projects/ad777x_ardz/zed/system_bd.tcl | 4 +-- .../ad9081_fmca_ebz/a10soc/system_qsys.tcl | 19 +++++++++-- projects/ad9081_fmca_ebz/vck190/system_bd.tcl | 29 +++++++++++----- projects/ad9081_fmca_ebz/vcu118/system_bd.tcl | 28 +++++++++++---- projects/ad9081_fmca_ebz/vcu128/system_bd.tcl | 30 ++++++++++++---- projects/ad9081_fmca_ebz/zc706/system_bd.tcl | 19 ++++++++--- projects/ad9081_fmca_ebz/zcu102/system_bd.tcl | 30 +++++++++++----- .../zcu102/system_bd.tcl | 29 ++++++++++++---- projects/ad9082_fmca_ebz/vcu118/system_bd.tcl | 2 +- projects/ad9083_evb/a10soc/system_qsys.tcl | 7 ++-- projects/ad9083_evb/zcu102/system_bd.tcl | 13 ++++--- projects/ad9083_vna/zcu102/system_bd.tcl | 10 +++--- projects/ad9208_dual_ebz/vcu118/system_bd.tcl | 6 +--- projects/ad9213_evb/vcu118/system_bd.tcl | 2 +- projects/ad9265_fmc/zc706/system_bd.tcl | 4 +-- projects/ad9434_fmc/zc706/system_bd.tcl | 4 +-- projects/ad9467_fmc/kc705/system_bd.tcl | 4 +-- projects/ad9467_fmc/zed/system_bd.tcl | 4 +-- projects/ad9656_fmc/zcu102/system_bd.tcl | 6 ++-- projects/ad9695_fmc/zcu102/system_bd.tcl | 10 +++--- projects/ad9739a_fmc/zc706/system_bd.tcl | 4 +-- projects/ad9783_ebz/zcu102/system_bd.tcl | 4 +-- .../ad_fmclidar1_ebz/a10soc/system_qsys.tcl | 10 ++++-- projects/ad_fmclidar1_ebz/zc706/system_bd.tcl | 12 ++++--- .../ad_fmclidar1_ebz/zcu102/system_bd.tcl | 12 ++++--- .../ad_quadmxfe1_ebz/vcu118/system_bd.tcl | 32 +++++++++++++---- projects/adaq7980_sdz/zed/system_bd.tcl | 11 +++--- projects/adaq8092_fmc/zed/system_bd.tcl | 4 +-- projects/adrv9001/a10soc/system_qsys.tcl | 5 ++- projects/adrv9001/zc706/system_bd.tcl | 13 ++++--- projects/adrv9001/zcu102/system_bd.tcl | 13 ++++--- projects/adrv9001/zed/system_bd.tcl | 11 +++--- projects/adrv9009/a10soc/system_qsys.tcl | 7 ++-- projects/adrv9009/zc706/system_bd.tcl | 18 +++++++--- projects/adrv9009/zcu102/system_bd.tcl | 18 +++++++--- .../adrv9009zu11eg/adrv2crr_fmc/system_bd.tcl | 16 +++++++-- .../adrv2crr_fmcomms8/system_bd.tcl | 17 +++++++--- .../adrv2crr_fmcxmwbr1/system_bd.tcl | 16 ++++++--- .../adrv2crr_xmicrowave/system_bd.tcl | 16 ++++++--- .../adrv9361z7035/ccbob_cmos/system_bd.tcl | 4 +-- .../adrv9361z7035/ccbob_lvds/system_bd.tcl | 4 +-- .../adrv9361z7035/ccfmc_lvds/system_bd.tcl | 4 +-- .../adrv9361z7035/ccpackrf_lvds/system_bd.tcl | 4 +-- .../adrv9364z7020/ccbob_cmos/system_bd.tcl | 4 +-- .../adrv9364z7020/ccbob_lvds/system_bd.tcl | 4 +-- .../adrv9364z7020/ccpackrf_lvds/system_bd.tcl | 4 +-- projects/adrv9371x/a10soc/system_qsys.tcl | 6 ++-- projects/adrv9371x/kcu105/system_bd.tcl | 18 +++++++--- projects/adrv9371x/zc706/system_bd.tcl | 19 ++++++++--- projects/adrv9371x/zcu102/system_bd.tcl | 17 +++++++--- projects/adv7511/zc702/system_bd.tcl | 4 +-- projects/adv7511/zc706/system_bd.tcl | 4 +-- projects/adv7511/zed/system_bd.tcl | 5 +-- projects/adv7513/de10nano/system_qsys.tcl | 5 ++- projects/arradio/c5soc/system_qsys.tcl | 6 ++-- projects/cn0363/zed/system_bd.tcl | 4 +-- projects/cn0501/coraz7s/system_bd.tcl | 5 ++- projects/cn0506/a10soc/system_qsys.tcl | 2 +- projects/cn0506/zc706/system_bd.tcl | 7 ++-- projects/cn0506/zcu102/system_bd.tcl | 9 +++-- projects/cn0506/zed/system_bd.tcl | 7 ++-- projects/cn0540/coraz7s/system_bd.tcl | 5 +-- projects/cn0540/de10nano/system_qsys.tcl | 5 ++- projects/cn0561/coraz7s/system_bd.tcl | 4 +-- projects/cn0561/de10nano/system_qsys.tcl | 5 ++- projects/cn0561/zed/system_bd.tcl | 4 +-- projects/cn0577/zed/system_bd.tcl | 8 ++--- projects/cn0579/coraz7s/system_bd.tcl | 4 +-- projects/cn0579/de10nano/system_qsys.tcl | 6 ++-- projects/common/a10gx/system_qsys.tcl | 6 ++-- projects/common/a10soc/system_qsys.tcl | 5 ++- projects/common/ac701/system_bd.tcl | 2 +- projects/common/c5soc/system_qsys.tcl | 5 ++- projects/common/de10nano/system_qsys.tcl | 5 ++- projects/common/kc705/system_bd.tcl | 2 +- projects/common/kcu105/system_bd.tcl | 2 +- projects/common/kv260/system_bd.tcl | 2 +- projects/common/vc707/system_bd.tcl | 2 +- projects/common/vc709/system_bd.tcl | 2 +- projects/common/vck190/system_bd.tcl | 2 +- projects/common/vcu118/system_bd.tcl | 2 +- projects/common/vcu128/system_bd.tcl | 2 +- projects/common/vmk180/system_bd.tcl | 2 +- projects/common/zc702/system_bd.tcl | 2 +- projects/common/zc706/system_bd.tcl | 2 +- projects/common/zcu102/system_bd.tcl | 2 +- projects/common/zed/system_bd.tcl | 2 +- projects/dac_fmc_ebz/a10soc/system_qsys.tcl | 10 ++++-- projects/dac_fmc_ebz/vcu118/system_bd.tcl | 17 +++++++--- projects/dac_fmc_ebz/zc706/system_bd.tcl | 16 ++++++--- projects/dac_fmc_ebz/zcu102/system_bd.tcl | 18 +++++++--- projects/daq2/a10soc/system_qsys.tcl | 7 ++-- projects/daq2/kc705/system_bd.tcl | 16 ++++++--- projects/daq2/kcu105/system_bd.tcl | 16 ++++++--- projects/daq2/zc706/system_bd.tcl | 16 ++++++--- projects/daq2/zcu102/system_bd.tcl | 16 ++++++--- projects/daq3/kcu105/system_bd.tcl | 15 +++++--- projects/daq3/vcu118/system_bd.tcl | 16 ++++++--- projects/daq3/zc706/system_bd.tcl | 15 +++++--- projects/daq3/zcu102/system_bd.tcl | 14 +++++--- projects/fmcadc2/vc707/system_bd.tcl | 12 ++++--- projects/fmcadc2/zc706/system_bd.tcl | 13 ++++--- projects/fmcadc5/vc707/system_bd.tcl | 8 ++--- projects/fmcjesdadc1/kc705/system_bd.tcl | 12 ++++--- projects/fmcjesdadc1/vc707/system_bd.tcl | 11 +++--- projects/fmcjesdadc1/zc706/system_bd.tcl | 11 +++--- projects/fmcomms11/zc706/system_bd.tcl | 9 ++--- projects/fmcomms2/kc705/system_bd.tcl | 5 +-- projects/fmcomms2/kcu105/system_bd.tcl | 5 +-- projects/fmcomms2/vc707/system_bd.tcl | 5 +-- projects/fmcomms2/zc702/system_bd.tcl | 5 +-- projects/fmcomms2/zc706/system_bd.tcl | 5 +-- projects/fmcomms2/zcu102/system_bd.tcl | 5 +-- projects/fmcomms2/zed/system_bd.tcl | 5 +-- projects/fmcomms5/zc702/system_bd.tcl | 5 +-- projects/fmcomms5/zc706/system_bd.tcl | 5 +-- projects/fmcomms5/zcu102/system_bd.tcl | 4 +-- projects/fmcomms8/a10soc/system_qsys.tcl | 8 ++--- projects/fmcomms8/zcu102/system_bd.tcl | 17 +++++++--- projects/imageon/zed/system_bd.tcl | 4 +-- projects/jupiter_sdr/system_bd.tcl | 8 ++--- .../pulsar_adc_pmdz/coraz7s/system_bd.tcl | 4 +-- projects/scripts/adi_pd.tcl | 34 +++++++++++++------ projects/sidekiqz2/system_bd.tcl | 1 - 143 files changed, 770 insertions(+), 521 deletions(-) diff --git a/projects/ad40xx_fmc/zed/system_bd.tcl b/projects/ad40xx_fmc/zed/system_bd.tcl index 46952e1c94..469e6047cc 100644 --- a/projects/ad40xx_fmc/zed/system_bd.tcl +++ b/projects/ad40xx_fmc/zed/system_bd.tcl @@ -21,14 +21,18 @@ set ADC_SAMPLING_RATE [get_env_param ADC_SAMPLING_RATE 1800000] source ../common/ad40xx_bd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 set AD40XX_ADAQ400X_N [get_env_param AD40XX_ADAQ400X_N 1] -set sys_cstring "ad40xx: $AD40XX_ADAQ400X_N - adc_sampling_rate: $ADC_SAMPLING_RATE - adc_resolution: $ADC_RESOLUTION" -sysid_gen_sys_init_file $sys_cstring +if {$AD40XX_ADAQ400X_N == 0} { + set sys_cstring "ADAQ400X" +} else { + set sys_cstring "AD40XX" +} +set sys_cstring $sys_cstring "ADC_SAMPLING_RATE=$ADC_SAMPLING_RATE\ +ADC_RESOLUTION=$ADC_RESOLUTION" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad4110/zed/system_bd.tcl b/projects/ad4110/zed/system_bd.tcl index ca2e38c3a3..a95d4c75dd 100644 --- a/projects/ad4110/zed/system_bd.tcl +++ b/projects/ad4110/zed/system_bd.tcl @@ -8,7 +8,7 @@ source $ad_hdl_dir/projects/scripts/adi_pd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/ad4134_fmc/zed/system_bd.tcl b/projects/ad4134_fmc/zed/system_bd.tcl index f779246365..16e0c1a769 100755 --- a/projects/ad4134_fmc/zed/system_bd.tcl +++ b/projects/ad4134_fmc/zed/system_bd.tcl @@ -8,7 +8,7 @@ source $ad_hdl_dir/projects/scripts/adi_pd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/ad4630_fmc/zed/system_bd.tcl b/projects/ad4630_fmc/zed/system_bd.tcl index cf5c1aab25..5d429a520e 100644 --- a/projects/ad4630_fmc/zed/system_bd.tcl +++ b/projects/ad4630_fmc/zed/system_bd.tcl @@ -14,11 +14,14 @@ adi_project_files ad4630_fmc_zed [list \ # block design source ../common/ad463x_bd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -set sys_cstring "sys rom custom string placeholder" + +set sys_cstring "CLK_MODE=$ad_project_params(CLK_MODE)\ +NUM_OF_SDI=$ad_project_params(NUM_OF_SDI)\ +CAPTURE_ZONE=$ad_project_params(CAPTURE_ZONE)\ +DDR_EN=$ad_project_params(DDR_EN)" + sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad469x_fmc/zed/system_bd.tcl b/projects/ad469x_fmc/zed/system_bd.tcl index ca7562d780..66c3df4604 100644 --- a/projects/ad469x_fmc/zed/system_bd.tcl +++ b/projects/ad469x_fmc/zed/system_bd.tcl @@ -22,11 +22,17 @@ adi_project_files ad469x_fmc_zed [list \ source ../common/ad469x_bd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "DATA_WIDTH=$ad_project_params(DATA_WIDTH)\ +ASYNC_SPI_CLK=$ad_project_params(ASYNC_SPI_CLK)\ +NUM_CS=$ad_project_params(NUM_CS)\ +NUM_SDI=$ad_project_params(NUM_SDI)\ +SDI_DELAY=$ad_project_params(SDI_DELAY)\ +SAMPLING_RATE=$adc_sampling_rate" + +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad5758_sdz/zed/system_bd.tcl b/projects/ad5758_sdz/zed/system_bd.tcl index a02b6c4313..c08a08b945 100644 --- a/projects/ad5758_sdz/zed/system_bd.tcl +++ b/projects/ad5758_sdz/zed/system_bd.tcl @@ -6,12 +6,9 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file - diff --git a/projects/ad5766_sdz/zed/system_bd.tcl b/projects/ad5766_sdz/zed/system_bd.tcl index 037739bc57..bef02a8a5d 100644 --- a/projects/ad5766_sdz/zed/system_bd.tcl +++ b/projects/ad5766_sdz/zed/system_bd.tcl @@ -6,14 +6,11 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file source ../common/ad5766_bd.tcl - diff --git a/projects/ad6676evb/vc707/system_bd.tcl b/projects/ad6676evb/vc707/system_bd.tcl index 79dad08c7a..8c2ff1d293 100644 --- a/projects/ad6676evb/vc707/system_bd.tcl +++ b/projects/ad6676evb/vc707/system_bd.tcl @@ -7,11 +7,11 @@ source $ad_hdl_dir/projects/common/vc707/vc707_system_bd.tcl source ../common/ad6676evb_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:L=$ad_project_params(RX_JESD_L)" + +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad6676evb/zc706/system_bd.tcl b/projects/ad6676evb/zc706/system_bd.tcl index 1fde9d83e5..f4a6399840 100644 --- a/projects/ad6676evb/zc706/system_bd.tcl +++ b/projects/ad6676evb/zc706/system_bd.tcl @@ -7,11 +7,11 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source ../common/ad6676evb_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:L=$ad_project_params(RX_JESD_L)" + +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad7134_fmc/zed/system_bd.tcl b/projects/ad7134_fmc/zed/system_bd.tcl index be72681081..046d5ee52b 100644 --- a/projects/ad7134_fmc/zed/system_bd.tcl +++ b/projects/ad7134_fmc/zed/system_bd.tcl @@ -11,11 +11,9 @@ adi_project_files ad7134_fmc_zed [list \ "$ad_hdl_dir/library/util_cdc/sync_bits.v" \ ] -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/ad719x_asdz/coraz7s/system_bd.tcl b/projects/ad719x_asdz/coraz7s/system_bd.tcl index 4d08467a31..9f79a0b6a0 100644 --- a/projects/ad719x_asdz/coraz7s/system_bd.tcl +++ b/projects/ad719x_asdz/coraz7s/system_bd.tcl @@ -8,8 +8,7 @@ source $ad_hdl_dir/projects/scripts/adi_pd.tcl # system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -set sys_cstring "sys rom custom string placeholder" sysid_gen_sys_init_file diff --git a/projects/ad738x_fmc/zed/system_bd.tcl b/projects/ad738x_fmc/zed/system_bd.tcl index 69fdb46797..41d851aad4 100644 --- a/projects/ad738x_fmc/zed/system_bd.tcl +++ b/projects/ad738x_fmc/zed/system_bd.tcl @@ -6,15 +6,6 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - -#system ID -ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" -ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 - -sysid_gen_sys_init_file - # specify ADC resolution -- the design supports 16/14/12 bit resolutions set adc_resolution 16 @@ -27,5 +18,15 @@ set adc_num_of_channels 2 set adc_sampling_rate 3000000 -source ../common/ad738x_bd.tcl +#system ID +ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 +set sys_cstring "ADC_RESOLUTION=$adc_resolution\ +ADC_NUM_OF_CHANNELS=$adc_num_of_channels\ +ADC_SAMPLING_RATE=$adc_sampling_rate" + +sysid_gen_sys_init_file $sys_cstring + +source ../common/ad738x_bd.tcl diff --git a/projects/ad7405_fmc/zed/system_bd.tcl b/projects/ad7405_fmc/zed/system_bd.tcl index 100863fb76..2bd88e59f2 100644 --- a/projects/ad7405_fmc/zed/system_bd.tcl +++ b/projects/ad7405_fmc/zed/system_bd.tcl @@ -6,15 +6,6 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - -#system ID -ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" -ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 - -sysid_gen_sys_init_file - # System clock is 100 MHz for this base design set sys_cpu_clk_freq 100 @@ -30,5 +21,16 @@ set clkgen_vco_mul 50 set ext_clk_rate 25 -source ../common/ad7405_bd.tcl +#system ID +ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 +set sys_cstring "SYS_CPU_CLK_FREQ=$sys_cpu_clk_freq\ +CLKGEN_VCO_DIV=$clkgen_vco_div\ +CLKGEN_VCO_MUL=$clkgen_vco_mul\ +EXT_CLK_RATE=$ext_clk_rate" + +sysid_gen_sys_init_file $sys_cstring + +source ../common/ad7405_bd.tcl diff --git a/projects/ad7606x_fmc/zed/system_bd.tcl b/projects/ad7606x_fmc/zed/system_bd.tcl index 369a0261bf..975aa0ca8b 100644 --- a/projects/ad7606x_fmc/zed/system_bd.tcl +++ b/projects/ad7606x_fmc/zed/system_bd.tcl @@ -10,8 +10,11 @@ source ../common/ad7606x_bd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -set sys_cstring "$DEV_CONFIG,$SIMPLE_STATUS_CRC,$EXT_CLK" + +set sys_cstring "DEV_CONFIG=$DEV_CONFIG\ +SIMPLE_STATUS_CRC=$SIMPLE_STATUS_CRC\ +EXT_CLK=$EXT_CLK" sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad7616_sdz/zc706/system_bd.tcl b/projects/ad7616_sdz/zc706/system_bd.tcl index ed8efbbf42..c0489682e6 100644 --- a/projects/ad7616_sdz/zc706/system_bd.tcl +++ b/projects/ad7616_sdz/zc706/system_bd.tcl @@ -6,14 +6,15 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file - -source ../common/ad7616_bd.tcl +if {$SI_OR_PI == 0} { + set sys_cstring "SI" +} else { + set sys_cstring "PI" +} +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad7616_sdz/zed/system_bd.tcl b/projects/ad7616_sdz/zed/system_bd.tcl index 628a6ff903..f0436b1233 100644 --- a/projects/ad7616_sdz/zed/system_bd.tcl +++ b/projects/ad7616_sdz/zed/system_bd.tcl @@ -6,14 +6,15 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file - -source ../common/ad7616_bd.tcl +if {$SI_OR_PI == 0} { + set sys_cstring "SI" +} else { + set sys_cstring "PI" +} +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad77681evb/zed/system_bd.tcl b/projects/ad77681evb/zed/system_bd.tcl index 8caa481b4d..2c36909d71 100644 --- a/projects/ad77681evb/zed/system_bd.tcl +++ b/projects/ad77681evb/zed/system_bd.tcl @@ -6,14 +6,11 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file source ../common/ad77681evb_bd.tcl - diff --git a/projects/ad7768evb/zed/system_bd.tcl b/projects/ad7768evb/zed/system_bd.tcl index 197bfe125b..eb55608c0f 100644 --- a/projects/ad7768evb/zed/system_bd.tcl +++ b/projects/ad7768evb/zed/system_bd.tcl @@ -6,11 +6,9 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/ad777x_ardz/de10nano/system_qsys.tcl b/projects/ad777x_ardz/de10nano/system_qsys.tcl index e49be23168..ad9b1084d4 100644 --- a/projects/ad777x_ardz/de10nano/system_qsys.tcl +++ b/projects/ad777x_ardz/de10nano/system_qsys.tcl @@ -18,6 +18,6 @@ set_instance_parameter_value sys_spi {clockPolarity} {0} set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" -sysid_gen_sys_init_file; +sysid_gen_sys_init_file diff --git a/projects/ad777x_ardz/zed/system_bd.tcl b/projects/ad777x_ardz/zed/system_bd.tcl index 1340c4af8f..e233eb4927 100644 --- a/projects/ad777x_ardz/zed/system_bd.tcl +++ b/projects/ad777x_ardz/zed/system_bd.tcl @@ -7,11 +7,9 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source ../common/ad777x_ardz_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/ad9081_fmca_ebz/a10soc/system_qsys.tcl b/projects/ad9081_fmca_ebz/a10soc/system_qsys.tcl index f561048489..119d26a8b6 100755 --- a/projects/ad9081_fmca_ebz/a10soc/system_qsys.tcl +++ b/projects/ad9081_fmca_ebz/a10soc/system_qsys.tcl @@ -21,9 +21,22 @@ if [info exists ad_project_dir] { #system ID set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" - -sysid_gen_sys_init_file; +set sys_cstring "RX:RATE=$ad_project_params(RX_LANE_RATE)\ +M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +NP=$ad_project_params(RX_JESD_NP)\ +LINKS=$ad_project_params(RX_NUM_LINKS)\ +KS/CH=$ad_project_params(RX_KS_PER_CHANNEL)\ +TX:RATE=$ad_project_params(TX_LANE_RATE)\ +M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +NP=$ad_project_params(TX_JESD_NP)\ +LINKS=$ad_project_params(TX_NUM_LINKS)\ +KS/CH=$ad_project_params(TX_KS_PER_CHANNEL)" +sysid_gen_sys_init_file sys_cstring diff --git a/projects/ad9081_fmca_ebz/vck190/system_bd.tcl b/projects/ad9081_fmca_ebz/vck190/system_bd.tcl index 00f8d54326..a0808398c0 100644 --- a/projects/ad9081_fmca_ebz/vck190/system_bd.tcl +++ b/projects/ad9081_fmca_ebz/vck190/system_bd.tcl @@ -18,12 +18,25 @@ set ADI_PHY_SEL 0 source $ad_hdl_dir/projects/ad9081_fmca_ebz/common/ad9081_fmca_ebz_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID -ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" -ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 - -sysid_gen_sys_init_file - +ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 10 +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 10 + +set sys_cstring "$ad_project_params(JESD_MODE)\ +RX:RATE=$ad_project_params(RX_LANE_RATE)\ +M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +NP=$ad_project_params(RX_JESD_NP)\ +LINKS=$ad_project_params(RX_NUM_LINKS)\ +KS/CH=$ad_project_params(RX_KS_PER_CHANNEL)\ +TX:RATE=$ad_project_params(TX_LANE_RATE)\ +M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +NP=$ad_project_params(TX_JESD_NP)\ +LINKS=$ad_project_params(TX_NUM_LINKS)\ +KS/CH=$ad_project_params(TX_KS_PER_CHANNEL)" + +sysid_gen_sys_init_file $sys_cstring 10 diff --git a/projects/ad9081_fmca_ebz/vcu118/system_bd.tcl b/projects/ad9081_fmca_ebz/vcu118/system_bd.tcl index 62260bea93..3997693433 100644 --- a/projects/ad9081_fmca_ebz/vcu118/system_bd.tcl +++ b/projects/ad9081_fmca_ebz/vcu118/system_bd.tcl @@ -21,14 +21,28 @@ if {$INTF_CFG != "RX"} { ad_ip_parameter axi_mxfe_tx_jesd/tx CONFIG.NUM_OUTPUT_PIPELINE 1 } -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID -ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" -ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 - -sysid_gen_sys_init_file +ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 10 +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 10 + +set sys_cstring "$ad_project_params(JESD_MODE)\ +RX:RATE=$ad_project_params(RX_LANE_RATE)\ +M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +NP=$ad_project_params(RX_JESD_NP)\ +LINKS=$ad_project_params(RX_NUM_LINKS)\ +KS/CH=$ad_project_params(RX_KS_PER_CHANNEL)\ +TX:RATE=$ad_project_params(TX_LANE_RATE)\ +M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +NP=$ad_project_params(TX_JESD_NP)\ +LINKS=$ad_project_params(TX_NUM_LINKS)\ +KS/CH=$ad_project_params(TX_KS_PER_CHANNEL)" + +sysid_gen_sys_init_file $sys_cstring 10 # Parameters for 15.5Gpbs lane rate diff --git a/projects/ad9081_fmca_ebz/vcu128/system_bd.tcl b/projects/ad9081_fmca_ebz/vcu128/system_bd.tcl index 4400cb2c05..8c3e2db8a4 100644 --- a/projects/ad9081_fmca_ebz/vcu128/system_bd.tcl +++ b/projects/ad9081_fmca_ebz/vcu128/system_bd.tcl @@ -31,14 +31,30 @@ ad_connect HBM/HBM_REF_CLK_0 $sys_cpu_clk ad_connect HBM/APB_0_PCLK $sys_cpu_clk ad_connect HBM/APB_0_PRESET_N $sys_cpu_resetn -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID -ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" -ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 - -sysid_gen_sys_init_file +ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 10 +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 10 + +set sys_cstring "$ad_project_params(JESD_MODE)\ +RX:RATE=$ad_project_params(RX_LANE_RATE)\ +M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +NP=$ad_project_params(RX_JESD_NP)\ +LINKS=$ad_project_params(RX_NUM_LINKS)\ +KS/CH=$ad_project_params(RX_KS_PER_CHANNEL)\ +TX:RATE=$ad_project_params(TX_LANE_RATE)\ +M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +NP=$ad_project_params(TX_JESD_NP)\ +LINKS=$ad_project_params(TX_NUM_LINKS)\ +KS/CH=$ad_project_params(TX_KS_PER_CHANNEL)\ +ADC_DO_MEM_TYPE:$ad_project_params(ADC_DO_MEM_TYPE)\ +DAC_DO_MEM_TYPE:$ad_project_params(DAC_DO_MEM_TYPE)" + +sysid_gen_sys_init_file $sys_cstring 10 # Parameters for 15.5Gpbs lane rate diff --git a/projects/ad9081_fmca_ebz/zc706/system_bd.tcl b/projects/ad9081_fmca_ebz/zc706/system_bd.tcl index 02ab04d176..b952613a95 100644 --- a/projects/ad9081_fmca_ebz/zc706/system_bd.tcl +++ b/projects/ad9081_fmca_ebz/zc706/system_bd.tcl @@ -15,12 +15,23 @@ source $ad_hdl_dir/projects/ad9081_fmca_ebz/common/ad9081_fmca_ebz_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "$ad_project_params(JESD_MODE)\ +RX:RATE=$ad_project_params(RX_LANE_RATE)\ +M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +NP=$ad_project_params(RX_JESD_NP)\ +LINKS=$ad_project_params(RX_NUM_LINKS)\ +TX:RATE=$ad_project_params(TX_LANE_RATE)\ +M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +NP=$ad_project_params(TX_JESD_NP)\ +LINKS=$ad_project_params(TX_NUM_LINKS)" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad9081_fmca_ebz/zcu102/system_bd.tcl b/projects/ad9081_fmca_ebz/zcu102/system_bd.tcl index 6b47843f0e..247b44dfd3 100644 --- a/projects/ad9081_fmca_ebz/zcu102/system_bd.tcl +++ b/projects/ad9081_fmca_ebz/zcu102/system_bd.tcl @@ -8,7 +8,6 @@ set adc_fifo_samples_per_converter [expr 64*1024] ## DAC FIFO depth in samples per converter set dac_fifo_samples_per_converter [expr 64*1024] - source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source $ad_hdl_dir/projects/common/xilinx/adcfifo_bd.tcl source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl @@ -18,14 +17,30 @@ ad_mem_hp0_interconnect $sys_cpu_clk sys_ps8/S_AXI_HP0 source $ad_hdl_dir/projects/ad9081_fmca_ebz/common/ad9081_fmca_ebz_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID -ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" -ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 +ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 10 +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 10 -sysid_gen_sys_init_file +set sys_cstring "$ad_project_params(JESD_MODE)\ +RX:RATE=$ad_project_params(RX_LANE_RATE)\ +M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +NP=$ad_project_params(RX_JESD_NP)\ +LINKS=$ad_project_params(RX_NUM_LINKS)\ +TPL_W=$ad_project_params(RX_TPL_WIDTH)\ +TX:RATE=$ad_project_params(TX_LANE_RATE)\ +M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +NP=$ad_project_params(TX_JESD_NP)\ +LINKS=$ad_project_params(TX_NUM_LINKS)\ +TPL_W=$ad_project_params(TX_TPL_WIDTH)\ +TDD=$ad_project_params(TDD_SUPPORT)\ +SHARED_DEVCLK=$ad_project_params(SHARED_DEVCLK)" + +sysid_gen_sys_init_file $sys_cstring 10 # Parameters for 15.5Gpbs lane rate @@ -71,4 +86,3 @@ if {$ad_project_params(RX_LANE_RATE) < 12} { ad_ip_parameter util_mxfe_xcvr CONFIG.RXCDR_CFG3_GEN3 0x12 ad_ip_parameter util_mxfe_xcvr CONFIG.RXCDR_CFG3_GEN4 0x12 } - diff --git a/projects/ad9081_fmca_ebz_x_band/zcu102/system_bd.tcl b/projects/ad9081_fmca_ebz_x_band/zcu102/system_bd.tcl index 8664526421..e97e37d40d 100644 --- a/projects/ad9081_fmca_ebz_x_band/zcu102/system_bd.tcl +++ b/projects/ad9081_fmca_ebz_x_band/zcu102/system_bd.tcl @@ -18,11 +18,29 @@ source $ad_hdl_dir/projects/ad9081_fmca_ebz/common/ad9081_fmca_ebz_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl #system ID -ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" -ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 - -sysid_gen_sys_init_file +ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 10 +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 10 + +set sys_cstring "$ad_project_params(JESD_MODE)\ +RX:RATE=$ad_project_params(RX_LANE_RATE)\ +M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +NP=$ad_project_params(RX_JESD_NP)\ +LINKS=$ad_project_params(RX_NUM_LINKS)\ +KS/CH=$ad_project_params(RX_KS_PER_CHANNEL)\ +TX:RATE=$ad_project_params(TX_LANE_RATE)\ +M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +NP=$ad_project_params(TX_JESD_NP)\ +LINKS=$ad_project_params(TX_NUM_LINKS)\ +KS/CH=$ad_project_params(TX_KS_PER_CHANNEL)\ +TDD=$ad_project_params(TDD_SUPPORT)\ +SHARED_DEVCLK=$ad_project_params(SHARED_DEVCLK)" + +sysid_gen_sys_init_file $sys_cstring 10 # Parameters for 15.5Gpbs lane rate @@ -154,4 +172,3 @@ ad_connect axi_tdd_0/tdd_channel_2 tdd_enabled ad_connect axi_tdd_0/tdd_channel_3 tdd_rx_mxfe_en ad_connect axi_tdd_0/tdd_channel_4 tdd_tx_mxfe_en ad_connect axi_tdd_0/tdd_channel_5 tdd_tx_stingray_en - diff --git a/projects/ad9082_fmca_ebz/vcu118/system_bd.tcl b/projects/ad9082_fmca_ebz/vcu118/system_bd.tcl index 60469cb3ae..dcf572150b 100644 --- a/projects/ad9082_fmca_ebz/vcu118/system_bd.tcl +++ b/projects/ad9082_fmca_ebz/vcu118/system_bd.tcl @@ -3,4 +3,4 @@ # SPDX short identifier: ADIBSD ############################################################################### -source $ad_hdl_dir/projects/ad9081_fmca_ebz/vcu118/system_bd.tcl \ No newline at end of file +source $ad_hdl_dir/projects/ad9081_fmca_ebz/vcu118/system_bd.tcl diff --git a/projects/ad9083_evb/a10soc/system_qsys.tcl b/projects/ad9083_evb/a10soc/system_qsys.tcl index c281c9e296..419a600d01 100644 --- a/projects/ad9083_evb/a10soc/system_qsys.tcl +++ b/projects/ad9083_evb/a10soc/system_qsys.tcl @@ -4,6 +4,7 @@ ############################################################################### set adc_fifo_address_width 8 + source $ad_hdl_dir/projects/scripts/adi_pd.tcl source $ad_hdl_dir/projects/common/a10soc/a10soc_system_qsys.tcl source $ad_hdl_dir/projects/common/a10soc/a10soc_plddr4_dacfifo_qsys.tcl @@ -17,9 +18,7 @@ if [info exists ad_project_dir] { #system ID set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" - -sysid_gen_sys_init_file; - +sysid_gen_sys_init_file diff --git a/projects/ad9083_evb/zcu102/system_bd.tcl b/projects/ad9083_evb/zcu102/system_bd.tcl index ae898f7ae2..fee8709378 100644 --- a/projects/ad9083_evb/zcu102/system_bd.tcl +++ b/projects/ad9083_evb/zcu102/system_bd.tcl @@ -7,14 +7,13 @@ source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source ../common/ad9083_evb_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -set sys_cstring "RX_NUM_OF_LANES=$RX_NUM_OF_LANES \ -RX_NUM_OF_CONVERTERS=$RX_NUM_OF_CONVERTERS \ -RX_SAMPLES_PER_FRAME=$RX_SAMPLES_PER_FRAME" -sysid_gen_sys_init_file $sys_cstring +set sys_cstring "RX:L=$ad_project_params(RX_JESD_L)\ +M=$ad_project_params(RX_JESD_M)\ +S=$ad_project_params(RX_JESD_S)" + +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad9083_vna/zcu102/system_bd.tcl b/projects/ad9083_vna/zcu102/system_bd.tcl index 437879b690..7653ed4395 100644 --- a/projects/ad9083_vna/zcu102/system_bd.tcl +++ b/projects/ad9083_vna/zcu102/system_bd.tcl @@ -10,9 +10,11 @@ source ../common/ad9083_vna_bd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -set sys_cstring "RX_NUM_OF_LANES=$RX_NUM_OF_LANES \ -RX_NUM_OF_CONVERTERS=$RX_NUM_OF_CONVERTERS \ -RX_SAMPLES_PER_FRAME=$RX_SAMPLES_PER_FRAME" + +set sys_cstring "RX:L=$ad_project_params(RX_JESD_L)\ +M=$ad_project_params(RX_JESD_M)\ +S=$ad_project_params(RX_JESD_S)" + sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad9208_dual_ebz/vcu118/system_bd.tcl b/projects/ad9208_dual_ebz/vcu118/system_bd.tcl index ff6b504b0e..985fe4fc9c 100644 --- a/projects/ad9208_dual_ebz/vcu118/system_bd.tcl +++ b/projects/ad9208_dual_ebz/vcu118/system_bd.tcl @@ -11,11 +11,9 @@ source $ad_hdl_dir/projects/common/xilinx/adcfifo_bd.tcl source ../common/dual_ad9208_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file @@ -39,5 +37,3 @@ foreach i {0 1} { ad_ip_parameter util_adc_${i}_xcvr CONFIG.PPF0_CFG 0xB00 } - - diff --git a/projects/ad9213_evb/vcu118/system_bd.tcl b/projects/ad9213_evb/vcu118/system_bd.tcl index 97ae003de1..ffc5f1715d 100755 --- a/projects/ad9213_evb/vcu118/system_bd.tcl +++ b/projects/ad9213_evb/vcu118/system_bd.tcl @@ -17,7 +17,7 @@ ad_ip_parameter hmc7044_spi CONFIG.C_SCK_RATIO 16 #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/ad9265_fmc/zc706/system_bd.tcl b/projects/ad9265_fmc/zc706/system_bd.tcl index c6859b55cb..b642b2a332 100644 --- a/projects/ad9265_fmc/zc706/system_bd.tcl +++ b/projects/ad9265_fmc/zc706/system_bd.tcl @@ -7,11 +7,9 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source ../common/ad9265_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/ad9434_fmc/zc706/system_bd.tcl b/projects/ad9434_fmc/zc706/system_bd.tcl index ccc38f98cb..c68dd675db 100644 --- a/projects/ad9434_fmc/zc706/system_bd.tcl +++ b/projects/ad9434_fmc/zc706/system_bd.tcl @@ -7,11 +7,9 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source ../common/ad9434_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/ad9467_fmc/kc705/system_bd.tcl b/projects/ad9467_fmc/kc705/system_bd.tcl index a1d6cce213..5aa4329326 100644 --- a/projects/ad9467_fmc/kc705/system_bd.tcl +++ b/projects/ad9467_fmc/kc705/system_bd.tcl @@ -7,11 +7,9 @@ source $ad_hdl_dir/projects/common/kc705/kc705_system_bd.tcl source ../common/ad9467_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/ad9467_fmc/zed/system_bd.tcl b/projects/ad9467_fmc/zed/system_bd.tcl index 0ac736def7..e09ae99f16 100644 --- a/projects/ad9467_fmc/zed/system_bd.tcl +++ b/projects/ad9467_fmc/zed/system_bd.tcl @@ -7,11 +7,9 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source ../common/ad9467_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/ad9656_fmc/zcu102/system_bd.tcl b/projects/ad9656_fmc/zcu102/system_bd.tcl index 16bd58a28d..797a96b307 100644 --- a/projects/ad9656_fmc/zcu102/system_bd.tcl +++ b/projects/ad9656_fmc/zcu102/system_bd.tcl @@ -6,15 +6,13 @@ source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 + sysid_gen_sys_init_file ad_mem_hp0_interconnect sys_cpu_clk sys_ps8/S_AXI_HP0 source ../common/ad9656_fmc_bd.tcl - diff --git a/projects/ad9695_fmc/zcu102/system_bd.tcl b/projects/ad9695_fmc/zcu102/system_bd.tcl index ab4b4693d1..f0af8852bc 100644 --- a/projects/ad9695_fmc/zcu102/system_bd.tcl +++ b/projects/ad9695_fmc/zcu102/system_bd.tcl @@ -7,11 +7,13 @@ source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source ../common/ad9695_fmc_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -set sys_cstring "sys rom custom string placeholder" + +set sys_cstring "RX:L=$ad_project_params(RX_JESD_L)\ +M=$ad_project_params(RX_JESD_M)\ +S=$ad_project_params(RX_JESD_S)" + sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad9739a_fmc/zc706/system_bd.tcl b/projects/ad9739a_fmc/zc706/system_bd.tcl index 62280efa2d..6f4103cf8f 100644 --- a/projects/ad9739a_fmc/zc706/system_bd.tcl +++ b/projects/ad9739a_fmc/zc706/system_bd.tcl @@ -7,11 +7,9 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source ../common/ad9739a_fmc_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/ad9783_ebz/zcu102/system_bd.tcl b/projects/ad9783_ebz/zcu102/system_bd.tcl index 6d24990764..6fec92d02e 100755 --- a/projects/ad9783_ebz/zcu102/system_bd.tcl +++ b/projects/ad9783_ebz/zcu102/system_bd.tcl @@ -7,11 +7,9 @@ source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source ../common/ad9783_ebz_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/ad_fmclidar1_ebz/a10soc/system_qsys.tcl b/projects/ad_fmclidar1_ebz/a10soc/system_qsys.tcl index 4fcfe61242..e0e89a310e 100644 --- a/projects/ad_fmclidar1_ebz/a10soc/system_qsys.tcl +++ b/projects/ad_fmclidar1_ebz/a10soc/system_qsys.tcl @@ -24,11 +24,17 @@ source $ad_hdl_dir/projects/scripts/adi_pd.tcl #system ID set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" +set sys_cstring "SAMPLE_RATE_MHZ=$SAMPLE_RATE_MHZ\ +M=$NUM_OF_CHANNELS\ +S=$SAMPLES_PER_FRAME\ +L=$NUM_OF_LANES\ +NP=$ADC_RESOLUTION\ +LR=$LANE_RATE" -sysid_gen_sys_init_file; +sysid_gen_sys_init_file $sys_cstring #spi set_instance_parameter_value sys_spi {clockPhase} {1} diff --git a/projects/ad_fmclidar1_ebz/zc706/system_bd.tcl b/projects/ad_fmclidar1_ebz/zc706/system_bd.tcl index d38d1125af..02977fed02 100644 --- a/projects/ad_fmclidar1_ebz/zc706/system_bd.tcl +++ b/projects/ad_fmclidar1_ebz/zc706/system_bd.tcl @@ -39,12 +39,16 @@ ad_ip_parameter sys_ps7 CONFIG.PCW_I2C1_PERIPHERAL_ENABLE 1 ad_connect iic_dac sys_ps7/IIC_1 -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - # System ID instance and configuration ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "SAMPLE_RATE_MHZ=$SAMPLE_RATE_MHZ\ +M=$NUM_OF_CHANNELS\ +S=$SAMPLES_PER_FRAME\ +L=$NUM_OF_LANES\ +NP=$ADC_RESOLUTION\ +LR=$LANE_RATE" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad_fmclidar1_ebz/zcu102/system_bd.tcl b/projects/ad_fmclidar1_ebz/zcu102/system_bd.tcl index 16d02ca446..6a51ab121b 100644 --- a/projects/ad_fmclidar1_ebz/zcu102/system_bd.tcl +++ b/projects/ad_fmclidar1_ebz/zcu102/system_bd.tcl @@ -41,12 +41,16 @@ ad_cpu_interconnect 0x7c800000 afe_dac_iic ad_cpu_interrupt ps-12 mb-14 afe_dac_iic/iic2intc_irpt -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - # System ID instance and configuration ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "SAMPLE_RATE_MHZ=$SAMPLE_RATE_MHZ\ +M=$NUM_OF_CHANNELS\ +S=$SAMPLES_PER_FRAME\ +L=$NUM_OF_LANES\ +NP=$ADC_RESOLUTION\ +LR=$LANE_RATE" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad_quadmxfe1_ebz/vcu118/system_bd.tcl b/projects/ad_quadmxfe1_ebz/vcu118/system_bd.tcl index 3d2c50dbb0..3ed16129b9 100644 --- a/projects/ad_quadmxfe1_ebz/vcu118/system_bd.tcl +++ b/projects/ad_quadmxfe1_ebz/vcu118/system_bd.tcl @@ -17,14 +17,32 @@ source $ad_hdl_dir/projects/scripts/adi_pd.tcl # Set SPI clock to 100/16 = 6.25 MHz ad_ip_parameter axi_spi CONFIG.C_SCK_RATIO 16 -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID -ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" -ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -set sys_cstring "sys rom custom string placeholder" -sysid_gen_sys_init_file $sys_cstring +ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 10 +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 10 + +set sys_cstring "$ad_project_params(JESD_MODE)\ +RX:RATE=$ad_project_params(RX_LANE_RATE)\ +M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +NP=$ad_project_params(RX_JESD_NP)\ +LINKS=$ad_project_params(RX_NUM_LINKS)\ +KS/CH=$ad_project_params(RX_KS_PER_CHANNEL)\ +PLL_SEL=$ad_project_params(RX_PLL_SEL)\ +TX:RATE=$ad_project_params(TX_LANE_RATE)\ +M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +NP=$ad_project_params(TX_JESD_NP)\ +LINKS=$ad_project_params(TX_NUM_LINKS)\ +KS/CH=$ad_project_params(TX_KS_PER_CHANNEL)\ +PLL_SEL=$ad_project_params(TX_PLL_SEL)\ +REF_CLK=$ad_project_params(REF_CLK_RATE)\ +DAC_TPL_XBAR=$ad_project_params(DAC_TPL_XBAR_ENABLE)" + +sysid_gen_sys_init_file $sys_cstring 10 if {$ad_project_params(JESD_MODE) == "8B10B"} { # Parameters for 10Gpbs lane rate diff --git a/projects/adaq7980_sdz/zed/system_bd.tcl b/projects/adaq7980_sdz/zed/system_bd.tcl index 2a10ae08c3..e869d4d266 100644 --- a/projects/adaq7980_sdz/zed/system_bd.tcl +++ b/projects/adaq7980_sdz/zed/system_bd.tcl @@ -6,17 +6,16 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; +# specify ADC sampling rate in samples/seconds -- default is 1 MSPS +set adc_sampling_rate 1000000 #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "ADC_SAMPLING_RATE=$adc_sampling_rate" -# specify ADC sampling rate in samples/seconds -- default is 1 MSPS -set adc_sampling_rate 1000000 +sysid_gen_sys_init_file $sys_cstring source ../common/adaq7980_bd.tcl - diff --git a/projects/adaq8092_fmc/zed/system_bd.tcl b/projects/adaq8092_fmc/zed/system_bd.tcl index 8aae6b8c6f..928a8d0ca5 100644 --- a/projects/adaq8092_fmc/zed/system_bd.tcl +++ b/projects/adaq8092_fmc/zed/system_bd.tcl @@ -7,11 +7,9 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source ../common/adaq8092_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/adrv9001/a10soc/system_qsys.tcl b/projects/adrv9001/a10soc/system_qsys.tcl index 22033d756d..cf351a3dfe 100644 --- a/projects/adrv9001/a10soc/system_qsys.tcl +++ b/projects/adrv9001/a10soc/system_qsys.tcl @@ -16,9 +16,8 @@ set_instance_parameter_value sys_spi {clockPolarity} {0} #system ID set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" - set sys_cstring "sys rom custom string placeholder"; -sysid_gen_sys_init_file $sys_cstring; +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/adrv9001/zc706/system_bd.tcl b/projects/adrv9001/zc706/system_bd.tcl index 05898cf212..ad1b3f0c5f 100644 --- a/projects/adrv9001/zc706/system_bd.tcl +++ b/projects/adrv9001/zc706/system_bd.tcl @@ -7,12 +7,15 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source ../common/adrv9001_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -set sys_cstring "CMOS_LVDS_N=${ad_project_params(CMOS_LVDS_N)}" -sysid_gen_sys_init_file $sys_cstring +if {$ad_project_params(CMOS_LVDS_N) == 0} { + set sys_cstring "LVDS" +} else { + set sys_cstring "CMOS" +} + +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/adrv9001/zcu102/system_bd.tcl b/projects/adrv9001/zcu102/system_bd.tcl index efd6f35c1e..2106c72c23 100644 --- a/projects/adrv9001/zcu102/system_bd.tcl +++ b/projects/adrv9001/zcu102/system_bd.tcl @@ -9,14 +9,17 @@ source $ad_hdl_dir/projects/scripts/adi_pd.tcl ad_ip_parameter axi_adrv9001 CONFIG.USE_RX_CLK_FOR_TX [expr $ad_project_params(CMOS_LVDS_N) == 0] -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -set sys_cstring "CMOS_LVDS_N=${ad_project_params(CMOS_LVDS_N)}" + +if {$ad_project_params(CMOS_LVDS_N) == 0} { + set sys_cstring "LVDS" +} else { + set sys_cstring "CMOS" +} + sysid_gen_sys_init_file $sys_cstring set_property strategy Flow_RunPostRoutePhysOpt [get_runs impl_1] - diff --git a/projects/adrv9001/zed/system_bd.tcl b/projects/adrv9001/zed/system_bd.tcl index 239b056493..974093a0e0 100644 --- a/projects/adrv9001/zed/system_bd.tcl +++ b/projects/adrv9001/zed/system_bd.tcl @@ -10,12 +10,15 @@ source $ad_hdl_dir/projects/scripts/adi_pd.tcl ad_ip_parameter axi_adrv9001 CONFIG.RX_USE_BUFG 1 ad_ip_parameter axi_adrv9001 CONFIG.TX_USE_BUFG 1 -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +if {$ad_project_params(CMOS_LVDS_N) == 0} { + set sys_cstring "LVDS" +} else { + set sys_cstring "CMOS" +} +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/adrv9009/a10soc/system_qsys.tcl b/projects/adrv9009/a10soc/system_qsys.tcl index d57748c1ea..08ac7ec2a4 100755 --- a/projects/adrv9009/a10soc/system_qsys.tcl +++ b/projects/adrv9009/a10soc/system_qsys.tcl @@ -4,6 +4,7 @@ ############################################################################### set dac_fifo_address_width 10 + source $ad_hdl_dir/projects/scripts/adi_pd.tcl source $ad_hdl_dir/projects/common/a10soc/a10soc_system_qsys.tcl source $ad_hdl_dir/projects/common/a10soc/a10soc_plddr4_dacfifo_qsys.tcl @@ -16,9 +17,9 @@ if [info exists ad_project_dir] { #system ID set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" - -sysid_gen_sys_init_file; +set sys_cstring "DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/adrv9009/zc706/system_bd.tcl b/projects/adrv9009/zc706/system_bd.tcl index 124e80d7fc..32cfd1c22f 100644 --- a/projects/adrv9009/zc706/system_bd.tcl +++ b/projects/adrv9009/zc706/system_bd.tcl @@ -4,18 +4,28 @@ ############################################################################### set dac_fifo_address_width 10 + source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source $ad_hdl_dir/projects/common/zc706/zc706_plddr3_dacfifo_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +RX_OS:M=$ad_project_params(RX_OS_JESD_M)\ +L=$ad_project_params(RX_OS_JESD_L)\ +S=$ad_project_params(RX_OS_JESD_S)\ +DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width" + +sysid_gen_sys_init_file $sys_cstring ad_ip_parameter sys_ps7 CONFIG.PCW_FPGA2_PERIPHERAL_FREQMHZ 250 diff --git a/projects/adrv9009/zcu102/system_bd.tcl b/projects/adrv9009/zcu102/system_bd.tcl index d924ba2ef7..9847558772 100644 --- a/projects/adrv9009/zcu102/system_bd.tcl +++ b/projects/adrv9009/zcu102/system_bd.tcl @@ -12,14 +12,23 @@ source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +RX_OS:M=$ad_project_params(RX_OS_JESD_M)\ +L=$ad_project_params(RX_OS_JESD_L)\ +S=$ad_project_params(RX_OS_JESD_S)\ +DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width" + +sysid_gen_sys_init_file $sys_cstring ad_mem_hp0_interconnect sys_cpu_clk sys_ps8/S_AXI_HP0 @@ -34,4 +43,3 @@ ad_ip_parameter axi_adrv9009_tx_dma CONFIG.FIFO_SIZE 32 ad_ip_parameter util_adrv9009_xcvr CONFIG.QPLL_FBDIV 80 ad_ip_parameter util_adrv9009_xcvr CONFIG.QPLL_REFCLK_DIV 1 - diff --git a/projects/adrv9009zu11eg/adrv2crr_fmc/system_bd.tcl b/projects/adrv9009zu11eg/adrv2crr_fmc/system_bd.tcl index 5834d154e7..823586f7bf 100644 --- a/projects/adrv9009zu11eg/adrv2crr_fmc/system_bd.tcl +++ b/projects/adrv9009zu11eg/adrv2crr_fmc/system_bd.tcl @@ -7,10 +7,20 @@ source ../common/adrv9009zu11eg_bd.tcl source ../common/adrv2crr_fmc_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +RX_OS:M=$ad_project_params(RX_OS_JESD_M)\ +L=$ad_project_params(RX_OS_JESD_L)\ +S=$ad_project_params(RX_OS_JESD_S)" + +sysid_gen_sys_init_file $sys_cstring + sysid_gen_sys_init_file diff --git a/projects/adrv9009zu11eg/adrv2crr_fmcomms8/system_bd.tcl b/projects/adrv9009zu11eg/adrv2crr_fmcomms8/system_bd.tcl index fdcb700f64..9098512019 100644 --- a/projects/adrv9009zu11eg/adrv2crr_fmcomms8/system_bd.tcl +++ b/projects/adrv9009zu11eg/adrv2crr_fmcomms8/system_bd.tcl @@ -4,6 +4,7 @@ ############################################################################### set FMCOMMS8 1 + source ../common/adrv9009zu11eg_bd.tcl source ../common/adrv2crr_fmc_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl @@ -79,13 +80,21 @@ ad_xcvrpll axi_adrv9009_som_rx_xcvr/up_pll_rst util_adrv9009_som_xcvr/up_cpll_r ad_xcvrpll axi_adrv9009_som_obs_xcvr/up_pll_rst util_adrv9009_som_xcvr/up_cpll_rst_14 ad_xcvrpll axi_adrv9009_som_obs_xcvr/up_pll_rst util_adrv9009_som_xcvr/up_cpll_rst_15 -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +RX_OS:M=$ad_project_params(RX_OS_JESD_M)\ +L=$ad_project_params(RX_OS_JESD_L)\ +S=$ad_project_params(RX_OS_JESD_S)" + +sysid_gen_sys_init_file $sys_cstring ad_cpu_interconnect 0x46000000 axi_fmcomms8_gpio diff --git a/projects/adrv9009zu11eg/adrv2crr_fmcxmwbr1/system_bd.tcl b/projects/adrv9009zu11eg/adrv2crr_fmcxmwbr1/system_bd.tcl index e9d95f5459..f0ebafcf8a 100755 --- a/projects/adrv9009zu11eg/adrv2crr_fmcxmwbr1/system_bd.tcl +++ b/projects/adrv9009zu11eg/adrv2crr_fmcxmwbr1/system_bd.tcl @@ -7,13 +7,21 @@ source ../common/adrv9009zu11eg_bd.tcl source ../common/adrv2crr_fmc_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +RX_OS:M=$ad_project_params(RX_OS_JESD_M)\ +L=$ad_project_params(RX_OS_JESD_L)\ +S=$ad_project_params(RX_OS_JESD_S)" + +sysid_gen_sys_init_file $sys_cstring # iic diff --git a/projects/adrv9009zu11eg/adrv2crr_xmicrowave/system_bd.tcl b/projects/adrv9009zu11eg/adrv2crr_xmicrowave/system_bd.tcl index d4b502e7f4..11259d2ca9 100755 --- a/projects/adrv9009zu11eg/adrv2crr_xmicrowave/system_bd.tcl +++ b/projects/adrv9009zu11eg/adrv2crr_xmicrowave/system_bd.tcl @@ -7,13 +7,21 @@ source ../common/adrv9009zu11eg_bd.tcl source ../common/adrv2crr_fmc_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +RX_OS:M=$ad_project_params(RX_OS_JESD_M)\ +L=$ad_project_params(RX_OS_JESD_L)\ +S=$ad_project_params(RX_OS_JESD_S)" + +sysid_gen_sys_init_file $sys_cstring # iic diff --git a/projects/adrv9361z7035/ccbob_cmos/system_bd.tcl b/projects/adrv9361z7035/ccbob_cmos/system_bd.tcl index 77fe8a1b19..1d6445db0e 100644 --- a/projects/adrv9361z7035/ccbob_cmos/system_bd.tcl +++ b/projects/adrv9361z7035/ccbob_cmos/system_bd.tcl @@ -14,11 +14,9 @@ cfg_ad9361_interface CMOS ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 29 -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/adrv9361z7035/ccbob_lvds/system_bd.tcl b/projects/adrv9361z7035/ccbob_lvds/system_bd.tcl index 59b98781a5..707370a23f 100644 --- a/projects/adrv9361z7035/ccbob_lvds/system_bd.tcl +++ b/projects/adrv9361z7035/ccbob_lvds/system_bd.tcl @@ -11,11 +11,9 @@ cfg_ad9361_interface LVDS ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 29 -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/adrv9361z7035/ccfmc_lvds/system_bd.tcl b/projects/adrv9361z7035/ccfmc_lvds/system_bd.tcl index 7634b52d1e..79b7541cd9 100644 --- a/projects/adrv9361z7035/ccfmc_lvds/system_bd.tcl +++ b/projects/adrv9361z7035/ccfmc_lvds/system_bd.tcl @@ -14,11 +14,9 @@ ad_connect sys_cpu_clk sys_cpu_clk_out ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 29 -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/adrv9361z7035/ccpackrf_lvds/system_bd.tcl b/projects/adrv9361z7035/ccpackrf_lvds/system_bd.tcl index 371e7ae1dc..e500343501 100644 --- a/projects/adrv9361z7035/ccpackrf_lvds/system_bd.tcl +++ b/projects/adrv9361z7035/ccpackrf_lvds/system_bd.tcl @@ -14,11 +14,9 @@ ad_connect sys_cpu_clk sys_cpu_clk_out set_property CONFIG.ADC_INIT_DELAY 29 [get_bd_cells axi_ad9361] -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/adrv9364z7020/ccbob_cmos/system_bd.tcl b/projects/adrv9364z7020/ccbob_cmos/system_bd.tcl index 019b45f80b..1ddd0a0546 100644 --- a/projects/adrv9364z7020/ccbob_cmos/system_bd.tcl +++ b/projects/adrv9364z7020/ccbob_cmos/system_bd.tcl @@ -14,11 +14,9 @@ cfg_ad9361_interface CMOS set_property CONFIG.ADC_INIT_DELAY 30 [get_bd_cells axi_ad9361] -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/adrv9364z7020/ccbob_lvds/system_bd.tcl b/projects/adrv9364z7020/ccbob_lvds/system_bd.tcl index 4b6cd253d8..8fce540a15 100644 --- a/projects/adrv9364z7020/ccbob_lvds/system_bd.tcl +++ b/projects/adrv9364z7020/ccbob_lvds/system_bd.tcl @@ -11,11 +11,9 @@ cfg_ad9361_interface LVDS set_property CONFIG.ADC_INIT_DELAY 30 [get_bd_cells axi_ad9361] -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/adrv9364z7020/ccpackrf_lvds/system_bd.tcl b/projects/adrv9364z7020/ccpackrf_lvds/system_bd.tcl index 8b258d954e..8639a2356f 100644 --- a/projects/adrv9364z7020/ccpackrf_lvds/system_bd.tcl +++ b/projects/adrv9364z7020/ccpackrf_lvds/system_bd.tcl @@ -14,11 +14,9 @@ ad_connect sys_cpu_clk sys_cpu_clk_out set_property CONFIG.ADC_INIT_DELAY 30 [get_bd_cells axi_ad9361] -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/adrv9371x/a10soc/system_qsys.tcl b/projects/adrv9371x/a10soc/system_qsys.tcl index 750f0e4d4a..c38e0abf36 100644 --- a/projects/adrv9371x/a10soc/system_qsys.tcl +++ b/projects/adrv9371x/a10soc/system_qsys.tcl @@ -17,9 +17,7 @@ if [info exists ad_project_dir] { #system ID set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" - -sysid_gen_sys_init_file; - +sysid_gen_sys_init_file diff --git a/projects/adrv9371x/kcu105/system_bd.tcl b/projects/adrv9371x/kcu105/system_bd.tcl index 2f94a9ad93..9908aa2e91 100644 --- a/projects/adrv9371x/kcu105/system_bd.tcl +++ b/projects/adrv9371x/kcu105/system_bd.tcl @@ -13,14 +13,23 @@ source $ad_hdl_dir/projects/common/kcu105/kcu105_system_mig.tcl source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +RX_OS:M=$ad_project_params(RX_OS_JESD_M)\ +L=$ad_project_params(RX_OS_JESD_L)\ +S=$ad_project_params(RX_OS_JESD_S)\ +DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width" + +sysid_gen_sys_init_file $sys_cstring ad_ip_parameter axi_ddr_cntrl CONFIG.ADDN_UI_CLKOUT3_FREQ_HZ 200 @@ -31,4 +40,3 @@ ad_ip_parameter util_ad9371_xcvr CONFIG.QPLL_REFCLK_DIV 1 ad_ip_parameter util_ad9371_xcvr CONFIG.CPLL_CFG0 0x67f8 ad_ip_parameter util_ad9371_xcvr CONFIG.CPLL_CFG1 0xa4ac ad_ip_parameter util_ad9371_xcvr CONFIG.CPLL_CFG2 0x0007 - diff --git a/projects/adrv9371x/zc706/system_bd.tcl b/projects/adrv9371x/zc706/system_bd.tcl index 890f170c05..0283cb8d02 100644 --- a/projects/adrv9371x/zc706/system_bd.tcl +++ b/projects/adrv9371x/zc706/system_bd.tcl @@ -4,20 +4,29 @@ ############################################################################### set dac_fifo_address_width 10 + source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source $ad_hdl_dir/projects/common/zc706/zc706_plddr3_dacfifo_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +RX_OS:M=$ad_project_params(RX_OS_JESD_M)\ +L=$ad_project_params(RX_OS_JESD_L)\ +S=$ad_project_params(RX_OS_JESD_S) +DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width" + +sysid_gen_sys_init_file $sys_cstring ad_ip_parameter sys_ps7 CONFIG.PCW_FPGA2_PERIPHERAL_FREQMHZ 200 source ../common/adrv9371x_bd.tcl - diff --git a/projects/adrv9371x/zcu102/system_bd.tcl b/projects/adrv9371x/zcu102/system_bd.tcl index 2596f9f7c4..963fedecf6 100644 --- a/projects/adrv9371x/zcu102/system_bd.tcl +++ b/projects/adrv9371x/zcu102/system_bd.tcl @@ -12,14 +12,23 @@ source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +RX_OS:M=$ad_project_params(RX_OS_JESD_M)\ +L=$ad_project_params(RX_OS_JESD_L)\ +S=$ad_project_params(RX_OS_JESD_S)\ +DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width" + +sysid_gen_sys_init_file $sys_cstring ad_ip_parameter sys_ps8 CONFIG.PSU__FPGA_PL2_ENABLE 1 ad_ip_parameter sys_ps8 CONFIG.PSU__CRL_APB__PL2_REF_CTRL__SRCSEL {IOPLL} diff --git a/projects/adv7511/zc702/system_bd.tcl b/projects/adv7511/zc702/system_bd.tcl index 9845075686..c3ff34b94c 100644 --- a/projects/adv7511/zc702/system_bd.tcl +++ b/projects/adv7511/zc702/system_bd.tcl @@ -6,11 +6,9 @@ source $ad_hdl_dir/projects/common/zc702/zc702_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/adv7511/zc706/system_bd.tcl b/projects/adv7511/zc706/system_bd.tcl index 0bb4265190..f2d84d9953 100644 --- a/projects/adv7511/zc706/system_bd.tcl +++ b/projects/adv7511/zc706/system_bd.tcl @@ -6,11 +6,9 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/adv7511/zed/system_bd.tcl b/projects/adv7511/zed/system_bd.tcl index c0bd6ef33a..696846569d 100644 --- a/projects/adv7511/zed/system_bd.tcl +++ b/projects/adv7511/zed/system_bd.tcl @@ -6,12 +6,9 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file - diff --git a/projects/adv7513/de10nano/system_qsys.tcl b/projects/adv7513/de10nano/system_qsys.tcl index 913edc170e..2e3068677c 100644 --- a/projects/adv7513/de10nano/system_qsys.tcl +++ b/projects/adv7513/de10nano/system_qsys.tcl @@ -8,9 +8,8 @@ source $ad_hdl_dir/projects/common/de10nano/de10nano_system_qsys.tcl #system ID set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" - -sysid_gen_sys_init_file; +sysid_gen_sys_init_file diff --git a/projects/arradio/c5soc/system_qsys.tcl b/projects/arradio/c5soc/system_qsys.tcl index d9cf12b6db..a3690b6d2d 100644 --- a/projects/arradio/c5soc/system_qsys.tcl +++ b/projects/arradio/c5soc/system_qsys.tcl @@ -14,9 +14,7 @@ if [info exists ad_project_dir] { #system ID set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" - -sysid_gen_sys_init_file; - +sysid_gen_sys_init_file diff --git a/projects/cn0363/zed/system_bd.tcl b/projects/cn0363/zed/system_bd.tcl index d5dd27e6ca..7c9c879533 100644 --- a/projects/cn0363/zed/system_bd.tcl +++ b/projects/cn0363/zed/system_bd.tcl @@ -7,11 +7,9 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source ../common/cn0363_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/cn0501/coraz7s/system_bd.tcl b/projects/cn0501/coraz7s/system_bd.tcl index fcad89e104..a4794ea434 100644 --- a/projects/cn0501/coraz7s/system_bd.tcl +++ b/projects/cn0501/coraz7s/system_bd.tcl @@ -7,12 +7,11 @@ source $ad_hdl_dir/projects/common/coraz7s/coraz7s_system_bd.tcl source ../common/cn0501_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 + set sys_cstring "sys rom custom string placeholder" sysid_gen_sys_init_file $sys_cstring diff --git a/projects/cn0506/a10soc/system_qsys.tcl b/projects/cn0506/a10soc/system_qsys.tcl index 7aeeaa2314..ee2c76905e 100644 --- a/projects/cn0506/a10soc/system_qsys.tcl +++ b/projects/cn0506/a10soc/system_qsys.tcl @@ -58,7 +58,7 @@ add_connection sys_clk.clk sys_hps.emac_ptp_ref_clock #system ID set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" sysid_gen_sys_init_file "MII" diff --git a/projects/cn0506/zc706/system_bd.tcl b/projects/cn0506/zc706/system_bd.tcl index 0f070613b1..202e5a9ec0 100644 --- a/projects/cn0506/zc706/system_bd.tcl +++ b/projects/cn0506/zc706/system_bd.tcl @@ -116,12 +116,11 @@ switch $INTF_CFG { source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -set INTF_CFG $::env(INTF_CFG) + set sys_cstring "$INTF_CFG" + sysid_gen_sys_init_file $sys_cstring diff --git a/projects/cn0506/zcu102/system_bd.tcl b/projects/cn0506/zcu102/system_bd.tcl index 46ed4c515a..c32878e008 100644 --- a/projects/cn0506/zcu102/system_bd.tcl +++ b/projects/cn0506/zcu102/system_bd.tcl @@ -124,18 +124,17 @@ switch $INTF_CFG { ad_connect proc_sys_reset_eth1/slowest_sync_clk ref_clk_50_b ad_connect proc_sys_reset_eth1/ext_reset_in sys_rstgen/peripheral_aresetn ad_connect proc_sys_reset_eth1/peripheral_reset reset_b - ad_connect proc_sys_reset_eth1/peripheral_aresetn mii_to_rmii_1/reset_n + ad_connect proc_sys_reset_eth1/peripheral_aresetn mii_to_rmii_1/reset_n } } source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -set INTF_CFG $::env(INTF_CFG) + set sys_cstring "$INTF_CFG" + sysid_gen_sys_init_file $sys_cstring diff --git a/projects/cn0506/zed/system_bd.tcl b/projects/cn0506/zed/system_bd.tcl index 90a6d6d594..a06fd4b8fb 100644 --- a/projects/cn0506/zed/system_bd.tcl +++ b/projects/cn0506/zed/system_bd.tcl @@ -116,12 +116,11 @@ switch $INTF_CFG { source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -set INTF_CFG $::env(INTF_CFG) + set sys_cstring "$INTF_CFG" + sysid_gen_sys_init_file $sys_cstring diff --git a/projects/cn0540/coraz7s/system_bd.tcl b/projects/cn0540/coraz7s/system_bd.tcl index 4743837000..2c0cb7a94c 100755 --- a/projects/cn0540/coraz7s/system_bd.tcl +++ b/projects/cn0540/coraz7s/system_bd.tcl @@ -6,11 +6,9 @@ source $ad_hdl_dir/projects/common/coraz7s/coraz7s_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file @@ -18,4 +16,3 @@ sysid_gen_sys_init_file set sys_dma_clk [get_bd_nets sys_dma_clk] source ../common/cn0540_bd.tcl - diff --git a/projects/cn0540/de10nano/system_qsys.tcl b/projects/cn0540/de10nano/system_qsys.tcl index ce1fe79ef1..217ab947ba 100755 --- a/projects/cn0540/de10nano/system_qsys.tcl +++ b/projects/cn0540/de10nano/system_qsys.tcl @@ -14,8 +14,7 @@ if [info exists ad_project_dir] { #system ID set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" - -sysid_gen_sys_init_file; +sysid_gen_sys_init_file diff --git a/projects/cn0561/coraz7s/system_bd.tcl b/projects/cn0561/coraz7s/system_bd.tcl index c0d0fab0bc..f1b256fb83 100644 --- a/projects/cn0561/coraz7s/system_bd.tcl +++ b/projects/cn0561/coraz7s/system_bd.tcl @@ -11,11 +11,9 @@ adi_project_files cn0561_coraz7s [list \ "$ad_hdl_dir/library/util_cdc/sync_bits.v" \ ] -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/cn0561/de10nano/system_qsys.tcl b/projects/cn0561/de10nano/system_qsys.tcl index 42b40d3592..95e64630f8 100644 --- a/projects/cn0561/de10nano/system_qsys.tcl +++ b/projects/cn0561/de10nano/system_qsys.tcl @@ -9,8 +9,7 @@ source ../common/cn0561_qsys.tcl #system ID set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" - -sysid_gen_sys_init_file; +sysid_gen_sys_init_file diff --git a/projects/cn0561/zed/system_bd.tcl b/projects/cn0561/zed/system_bd.tcl index e43525f44a..5526c1693e 100755 --- a/projects/cn0561/zed/system_bd.tcl +++ b/projects/cn0561/zed/system_bd.tcl @@ -6,11 +6,9 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 adi_project_files cn0561_fmc_zed [list \ diff --git a/projects/cn0577/zed/system_bd.tcl b/projects/cn0577/zed/system_bd.tcl index 9aab6abda4..f259d8efcb 100644 --- a/projects/cn0577/zed/system_bd.tcl +++ b/projects/cn0577/zed/system_bd.tcl @@ -10,11 +10,11 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl source ../common/cn0577_bd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -set sys_cstring "sys rom custom string placeholder" + +set sys_cstring "TWO_LANES=$two_lanes" + sysid_gen_sys_init_file $sys_cstring diff --git a/projects/cn0579/coraz7s/system_bd.tcl b/projects/cn0579/coraz7s/system_bd.tcl index 1723420438..8743076940 100644 --- a/projects/cn0579/coraz7s/system_bd.tcl +++ b/projects/cn0579/coraz7s/system_bd.tcl @@ -7,11 +7,11 @@ source $ad_hdl_dir/projects/common/coraz7s/coraz7s_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl #system ID - ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 set sys_cstring "sys rom custom string placeholder" + sysid_gen_sys_init_file $sys_cstring source ../common/cn0579_bd.tcl diff --git a/projects/cn0579/de10nano/system_qsys.tcl b/projects/cn0579/de10nano/system_qsys.tcl index a11a19bd0f..a367872417 100644 --- a/projects/cn0579/de10nano/system_qsys.tcl +++ b/projects/cn0579/de10nano/system_qsys.tcl @@ -16,10 +16,8 @@ if [info exists ad_project_dir] { set_instance_parameter_value sys_spi {clockPolarity} {0} #system ID - set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" - -sysid_gen_sys_init_file; +sysid_gen_sys_init_file diff --git a/projects/common/a10gx/system_qsys.tcl b/projects/common/a10gx/system_qsys.tcl index 303ec281f3..b15cd827f7 100755 --- a/projects/common/a10gx/system_qsys.tcl +++ b/projects/common/a10gx/system_qsys.tcl @@ -7,10 +7,8 @@ source $ad_hdl_dir/projects/scripts/adi_pd.tcl source $ad_hdl_dir/projects/common/a10gx/a10gx_system_qsys.tcl #system ID - set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" - -sysid_gen_sys_init_file; +sysid_gen_sys_init_file diff --git a/projects/common/a10soc/system_qsys.tcl b/projects/common/a10soc/system_qsys.tcl index bc71cf7865..06ed2553e0 100755 --- a/projects/common/a10soc/system_qsys.tcl +++ b/projects/common/a10soc/system_qsys.tcl @@ -8,8 +8,7 @@ source $ad_hdl_dir/projects/common/a10soc/a10soc_system_qsys.tcl #system ID set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" - -sysid_gen_sys_init_file; +sysid_gen_sys_init_file diff --git a/projects/common/ac701/system_bd.tcl b/projects/common/ac701/system_bd.tcl index 4f7065e9ba..ee6171e792 100755 --- a/projects/common/ac701/system_bd.tcl +++ b/projects/common/ac701/system_bd.tcl @@ -8,7 +8,7 @@ source $ad_hdl_dir/projects/common/ac701/ac701_system_bd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/common/c5soc/system_qsys.tcl b/projects/common/c5soc/system_qsys.tcl index aff7c4683d..ed989dd59b 100755 --- a/projects/common/c5soc/system_qsys.tcl +++ b/projects/common/c5soc/system_qsys.tcl @@ -8,8 +8,7 @@ source $ad_hdl_dir/projects/common/c5soc/c5soc_system_qsys.tcl #system ID set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" - -sysid_gen_sys_init_file; +sysid_gen_sys_init_file diff --git a/projects/common/de10nano/system_qsys.tcl b/projects/common/de10nano/system_qsys.tcl index 688d1088bc..11ecb014fc 100755 --- a/projects/common/de10nano/system_qsys.tcl +++ b/projects/common/de10nano/system_qsys.tcl @@ -8,8 +8,7 @@ source $ad_hdl_dir/projects/common/de10nano/de10nano_system_qsys.tcl #system ID set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" - -sysid_gen_sys_init_file; +sysid_gen_sys_init_file diff --git a/projects/common/kc705/system_bd.tcl b/projects/common/kc705/system_bd.tcl index d0d107a64c..064ca17add 100755 --- a/projects/common/kc705/system_bd.tcl +++ b/projects/common/kc705/system_bd.tcl @@ -8,7 +8,7 @@ source $ad_hdl_dir/projects/common/kc705/kc705_system_bd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/common/kcu105/system_bd.tcl b/projects/common/kcu105/system_bd.tcl index 03c8447cc7..3d0872dacc 100755 --- a/projects/common/kcu105/system_bd.tcl +++ b/projects/common/kcu105/system_bd.tcl @@ -8,7 +8,7 @@ source $ad_hdl_dir/projects/common/kcu105/kcu105_system_bd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/common/kv260/system_bd.tcl b/projects/common/kv260/system_bd.tcl index 4be600477b..5b40346547 100644 --- a/projects/common/kv260/system_bd.tcl +++ b/projects/common/kv260/system_bd.tcl @@ -8,7 +8,7 @@ source $ad_hdl_dir/projects/common/kv260/kv260_system_bd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/common/vc707/system_bd.tcl b/projects/common/vc707/system_bd.tcl index e672ab3ccf..dd43df543a 100755 --- a/projects/common/vc707/system_bd.tcl +++ b/projects/common/vc707/system_bd.tcl @@ -8,7 +8,7 @@ source $ad_hdl_dir/projects/common/vc707/vc707_system_bd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/common/vc709/system_bd.tcl b/projects/common/vc709/system_bd.tcl index 4b279997e6..0e13eb8547 100755 --- a/projects/common/vc709/system_bd.tcl +++ b/projects/common/vc709/system_bd.tcl @@ -8,7 +8,7 @@ source $ad_hdl_dir/projects/common/vc709/vc709_system_bd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/common/vck190/system_bd.tcl b/projects/common/vck190/system_bd.tcl index 8ede4a9791..bdcd594302 100755 --- a/projects/common/vck190/system_bd.tcl +++ b/projects/common/vck190/system_bd.tcl @@ -8,7 +8,7 @@ source $ad_hdl_dir/projects/common/vck190/vck190_system_bd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/common/vcu118/system_bd.tcl b/projects/common/vcu118/system_bd.tcl index 12b2a2b8d5..c3dc81c7f8 100755 --- a/projects/common/vcu118/system_bd.tcl +++ b/projects/common/vcu118/system_bd.tcl @@ -8,7 +8,7 @@ source $ad_hdl_dir/projects/common/vcu118/vcu118_system_bd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/common/vcu128/system_bd.tcl b/projects/common/vcu128/system_bd.tcl index 81e8704fb3..5279c9d95c 100755 --- a/projects/common/vcu128/system_bd.tcl +++ b/projects/common/vcu128/system_bd.tcl @@ -8,7 +8,7 @@ source $ad_hdl_dir/projects/common/vcu128/vcu128_system_bd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/common/vmk180/system_bd.tcl b/projects/common/vmk180/system_bd.tcl index 43db6ae548..b4d6b5b2c7 100755 --- a/projects/common/vmk180/system_bd.tcl +++ b/projects/common/vmk180/system_bd.tcl @@ -8,7 +8,7 @@ source $ad_hdl_dir/projects/common/vmk180/vmk180_system_bd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/common/zc702/system_bd.tcl b/projects/common/zc702/system_bd.tcl index a810ca953a..3cc5b744e9 100755 --- a/projects/common/zc702/system_bd.tcl +++ b/projects/common/zc702/system_bd.tcl @@ -8,7 +8,7 @@ source $ad_hdl_dir/projects/common/zc702/zc702_system_bd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/common/zc706/system_bd.tcl b/projects/common/zc706/system_bd.tcl index d004418514..6c9021c36f 100755 --- a/projects/common/zc706/system_bd.tcl +++ b/projects/common/zc706/system_bd.tcl @@ -8,7 +8,7 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/common/zcu102/system_bd.tcl b/projects/common/zcu102/system_bd.tcl index 91ce660481..2e666889cd 100755 --- a/projects/common/zcu102/system_bd.tcl +++ b/projects/common/zcu102/system_bd.tcl @@ -8,7 +8,7 @@ source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/common/zed/system_bd.tcl b/projects/common/zed/system_bd.tcl index 990d5faf93..0c2cba0495 100755 --- a/projects/common/zed/system_bd.tcl +++ b/projects/common/zed/system_bd.tcl @@ -8,7 +8,7 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/mem_init_sys.txt" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/dac_fmc_ebz/a10soc/system_qsys.tcl b/projects/dac_fmc_ebz/a10soc/system_qsys.tcl index 3761f4fd98..cd3312a814 100644 --- a/projects/dac_fmc_ebz/a10soc/system_qsys.tcl +++ b/projects/dac_fmc_ebz/a10soc/system_qsys.tcl @@ -17,9 +17,13 @@ if [info exists ad_project_dir] { #system ID set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" - -sysid_gen_sys_init_file; +set sys_cstring "JESD:L=$ad_project_params(JESD_L)\ +MODE=$ad_project_params(MODE)\ +DEVICE=$ad_project_params(DEVICE)\ +DEVICE_CODE=$ad_project_params(DEVICE_CODE)\ +DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width" +sysid_gen_sys_init_file sys_cstring diff --git a/projects/dac_fmc_ebz/vcu118/system_bd.tcl b/projects/dac_fmc_ebz/vcu118/system_bd.tcl index aa0ebc4874..a3fd9f2593 100755 --- a/projects/dac_fmc_ebz/vcu118/system_bd.tcl +++ b/projects/dac_fmc_ebz/vcu118/system_bd.tcl @@ -4,20 +4,29 @@ ############################################################################### set dac_fifo_address_width 14 + source $ad_hdl_dir/projects/common/vcu118/vcu118_system_bd.tcl source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl source ../common/dac_fmc_ebz_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 + set ADI_DAC_DEVICE $::env(ADI_DAC_DEVICE) set ADI_DAC_MODE $::env(ADI_DAC_MODE) -set sys_cstring "$ADI_DAC_DEVICE - $ADI_DAC_MODE" +set sys_cstring "JESD:M=$ad_project_params(JESD_M)\ +L=$ad_project_params(JESD_L)\ +S=$ad_project_params(JESD_S)\ +NP=$ad_project_params(JESD_NP)\ +LINKS=$ad_project_params(NUM_LINKS)\ +DEVICE_CODE=$ad_project_params(DEVICE_CODE)\ +DAC_DEVICE=$ADI_DAC_DEVICE\ +DAC_MODE=$ADI_DAC_MODE\ +DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width" + sysid_gen_sys_init_file $sys_cstring ad_ip_parameter dac_jesd204_link/tx CONFIG.SYSREF_IOB false diff --git a/projects/dac_fmc_ebz/zc706/system_bd.tcl b/projects/dac_fmc_ebz/zc706/system_bd.tcl index 668a067b28..7ef149e63c 100644 --- a/projects/dac_fmc_ebz/zc706/system_bd.tcl +++ b/projects/dac_fmc_ebz/zc706/system_bd.tcl @@ -10,15 +10,23 @@ source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl source ../common/dac_fmc_ebz_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 + set ADI_DAC_DEVICE $::env(ADI_DAC_DEVICE) set ADI_DAC_MODE $::env(ADI_DAC_MODE) -set sys_cstring "$ADI_DAC_DEVICE - $ADI_DAC_MODE" +set sys_cstring "JESD:M=$ad_project_params(JESD_M)\ +L=$ad_project_params(JESD_L)\ +S=$ad_project_params(JESD_S)\ +NP=$ad_project_params(JESD_NP)\ +LINKS=$ad_project_params(NUM_LINKS)\ +DEVICE_CODE=$ad_project_params(DEVICE_CODE)\ +DAC_DEVICE=$ADI_DAC_DEVICE\ +DAC_MODE=$ADI_DAC_MODE\ +DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width" + sysid_gen_sys_init_file $sys_cstring ad_ip_parameter dac_jesd204_link/tx CONFIG.SYSREF_IOB false diff --git a/projects/dac_fmc_ebz/zcu102/system_bd.tcl b/projects/dac_fmc_ebz/zcu102/system_bd.tcl index b981c99a52..cd69d4fcad 100644 --- a/projects/dac_fmc_ebz/zcu102/system_bd.tcl +++ b/projects/dac_fmc_ebz/zcu102/system_bd.tcl @@ -4,6 +4,7 @@ ############################################################################### set dac_fifo_address_width 13 + source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl source ../common/dac_fmc_ebz_bd.tcl @@ -31,14 +32,21 @@ ad_ip_parameter util_dac_jesd204_xcvr CONFIG.QPLL_LPF 0x31D ad_ip_parameter dac_jesd204_link/tx CONFIG.SYSREF_IOB false -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 + set ADI_DAC_DEVICE $::env(ADI_DAC_DEVICE) set ADI_DAC_MODE $::env(ADI_DAC_MODE) -set sys_cstring "$ADI_DAC_DEVICE - $ADI_DAC_MODE" -sysid_gen_sys_init_file $sys_cstring +set sys_cstring "JESD:M=$ad_project_params(JESD_M)\ +L=$ad_project_params(JESD_L)\ +S=$ad_project_params(JESD_S)\ +NP=$ad_project_params(JESD_NP)\ +LINKS=$ad_project_params(NUM_LINKS)\ +DEVICE_CODE=$ad_project_params(DEVICE_CODE)\ +DAC_DEVICE=$ADI_DAC_DEVICE\ +DAC_MODE=$ADI_DAC_MODE\ +DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/daq2/a10soc/system_qsys.tcl b/projects/daq2/a10soc/system_qsys.tcl index d01861afd0..f2881c2ae4 100644 --- a/projects/daq2/a10soc/system_qsys.tcl +++ b/projects/daq2/a10soc/system_qsys.tcl @@ -4,6 +4,7 @@ ############################################################################### set dac_fifo_address_width 10 + source $ad_hdl_dir/projects/scripts/adi_pd.tcl source $ad_hdl_dir/projects/common/a10soc/a10soc_system_qsys.tcl source $ad_hdl_dir/projects/common/a10soc/a10soc_plddr4_dacfifo_qsys.tcl @@ -16,9 +17,9 @@ if [info exists ad_project_dir] { #system ID set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" - -sysid_gen_sys_init_file; +set sys_cstring "DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/daq2/kc705/system_bd.tcl b/projects/daq2/kc705/system_bd.tcl index f9fe32ff8a..01b93914cc 100644 --- a/projects/daq2/kc705/system_bd.tcl +++ b/projects/daq2/kc705/system_bd.tcl @@ -18,12 +18,20 @@ source $ad_hdl_dir/projects/common/kc705/kc705_system_bd.tcl source ../common/daq2_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -set sys_cstring "ADC_OFFLOAD_TYPE=$adc_offload_type\nDAC_OFFLOAD_TYPE=$dac_offload_type" +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +ADC_OFFLOAD:TYPE=$adc_offload_type\ +SIZE=$adc_offload_size\ +DAC_OFFLOAD:TYPE=$dac_offload_type\ +SIZE=$dac_offload_size" + sysid_gen_sys_init_file $sys_cstring diff --git a/projects/daq2/kcu105/system_bd.tcl b/projects/daq2/kcu105/system_bd.tcl index d64480408a..a7f93d16a2 100644 --- a/projects/daq2/kcu105/system_bd.tcl +++ b/projects/daq2/kcu105/system_bd.tcl @@ -18,14 +18,22 @@ source $ad_hdl_dir/projects/common/kcu105/kcu105_system_bd.tcl source ../common/daq2_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -set sys_cstring "ADC_OFFLOAD_TYPE=$adc_offload_type\nDAC_OFFLOAD_TYPE=$dac_offload_type" +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +ADC_OFFLOAD:TYPE=$adc_offload_type\ +SIZE=$adc_offload_size\ +DAC_OFFLOAD:TYPE=$dac_offload_type\ +SIZE=$dac_offload_size" + sysid_gen_sys_init_file $sys_cstring ad_ip_parameter util_daq2_xcvr CONFIG.QPLL_FBDIV 20 diff --git a/projects/daq2/zc706/system_bd.tcl b/projects/daq2/zc706/system_bd.tcl index dbec6bfadb..96fc6a05b6 100644 --- a/projects/daq2/zc706/system_bd.tcl +++ b/projects/daq2/zc706/system_bd.tcl @@ -65,11 +65,19 @@ if {$adc_offload_type || $dac_offload_type} { # System ID ################################################################################ -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -set sys_cstring "ADC_OFFLOAD_TYPE=$adc_offload_type\nDAC_OFFLOAD_TYPE=$dac_offload_type" +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +ADC_OFFLOAD:TYPE=$adc_offload_type\ +SIZE=$adc_offload_size\ +DAC_OFFLOAD:TYPE=$dac_offload_type\ +SIZE=$dac_offload_size" + sysid_gen_sys_init_file $sys_cstring diff --git a/projects/daq2/zcu102/system_bd.tcl b/projects/daq2/zcu102/system_bd.tcl index 3f18d34e9b..01cc8b5822 100644 --- a/projects/daq2/zcu102/system_bd.tcl +++ b/projects/daq2/zcu102/system_bd.tcl @@ -18,14 +18,22 @@ source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source ../common/daq2_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -set sys_cstring "ADC_OFFLOAD_TYPE=$adc_offload_type\nDAC_OFFLOAD_TYPE=$dac_offload_type" +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +ADC_OFFLOAD:TYPE=$adc_offload_type\ +SIZE=$adc_offload_size\ +DAC_OFFLOAD:TYPE=$dac_offload_type\ +SIZE=$dac_offload_size" + sysid_gen_sys_init_file $sys_cstring ad_ip_parameter util_daq2_xcvr CONFIG.QPLL_FBDIV 20 diff --git a/projects/daq3/kcu105/system_bd.tcl b/projects/daq3/kcu105/system_bd.tcl index 079b422e63..843c4d4d53 100644 --- a/projects/daq3/kcu105/system_bd.tcl +++ b/projects/daq3/kcu105/system_bd.tcl @@ -17,14 +17,21 @@ source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl source ../common/daq3_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +ADC_FIFO_ADDR_WIDTH=$adc_fifo_address_width\ +DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width" + +sysid_gen_sys_init_file $sys_cstring ad_ip_parameter util_daq3_xcvr CONFIG.QPLL_FBDIV 20 ad_ip_parameter util_daq3_xcvr CONFIG.QPLL_REFCLK_DIV 1 diff --git a/projects/daq3/vcu118/system_bd.tcl b/projects/daq3/vcu118/system_bd.tcl index c5f280c678..d676cc9255 100644 --- a/projects/daq3/vcu118/system_bd.tcl +++ b/projects/daq3/vcu118/system_bd.tcl @@ -9,21 +9,27 @@ set adc_fifo_address_width 16 ## FIFO depth is 4Mb - 250k samples set dac_fifo_address_width 15 - source $ad_hdl_dir/projects/common/vcu118/vcu118_system_bd.tcl source $ad_hdl_dir/projects/common/xilinx/adcfifo_bd.tcl source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl source ../common/daq3_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S) +ADC_FIFO_ADDR_WIDTH=$adc_fifo_address_width\ +DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width" + +sysid_gen_sys_init_file $sys_cstring ad_ip_parameter util_daq3_xcvr CONFIG.QPLL_FBDIV 20 ad_ip_parameter util_daq3_xcvr CONFIG.QPLL_REFCLK_DIV 1 diff --git a/projects/daq3/zc706/system_bd.tcl b/projects/daq3/zc706/system_bd.tcl index b1c7c0ad8b..251c868ec1 100644 --- a/projects/daq3/zc706/system_bd.tcl +++ b/projects/daq3/zc706/system_bd.tcl @@ -17,11 +17,18 @@ source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl source ../common/daq3_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S) +ADC_FIFO_ADDR_WIDTH=$adc_fifo_address_width\ +DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width" + +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/daq3/zcu102/system_bd.tcl b/projects/daq3/zcu102/system_bd.tcl index 5a388015e1..7756446666 100644 --- a/projects/daq3/zcu102/system_bd.tcl +++ b/projects/daq3/zcu102/system_bd.tcl @@ -13,14 +13,20 @@ source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl source ../common/daq3_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S) +DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width" + +sysid_gen_sys_init_file $sys_cstring # configure the CPLL's to support 12.33Gbps ad_ip_parameter util_daq3_xcvr CONFIG.CPLL_CFG0 0x03fe diff --git a/projects/fmcadc2/vc707/system_bd.tcl b/projects/fmcadc2/vc707/system_bd.tcl index cdc227b886..d5bc71c361 100644 --- a/projects/fmcadc2/vc707/system_bd.tcl +++ b/projects/fmcadc2/vc707/system_bd.tcl @@ -13,11 +13,15 @@ source $ad_hdl_dir/projects/common/xilinx/adcfifo_bd.tcl source ../common/fmcadc2_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +NP=$ad_project_params(RX_JESD_NP) +ADC_FIFO_ADDR_WIDTH=$adc_fifo_address_width" + +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/fmcadc2/zc706/system_bd.tcl b/projects/fmcadc2/zc706/system_bd.tcl index 7eae6e2eb6..73fdc34972 100644 --- a/projects/fmcadc2/zc706/system_bd.tcl +++ b/projects/fmcadc2/zc706/system_bd.tcl @@ -4,16 +4,21 @@ ############################################################################### set adc_fifo_address_width 18 + source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source $ad_hdl_dir/projects/common/zc706/zc706_plddr3_adcfifo_bd.tcl source ../common/fmcadc2_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +NP=$ad_project_params(RX_JESD_NP) +ADC_FIFO_ADDR_WIDTH=$adc_fifo_address_width" + +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/fmcadc5/vc707/system_bd.tcl b/projects/fmcadc5/vc707/system_bd.tcl index 49dbd04421..9de8cff97b 100644 --- a/projects/fmcadc5/vc707/system_bd.tcl +++ b/projects/fmcadc5/vc707/system_bd.tcl @@ -13,14 +13,14 @@ source $ad_hdl_dir/projects/common/xilinx/adcfifo_bd.tcl source ../common/fmcadc5_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "ADC_FIFO_ADDR_WIDTH=$adc_fifo_address_width" + +sysid_gen_sys_init_file $sys_cstring # ila diff --git a/projects/fmcjesdadc1/kc705/system_bd.tcl b/projects/fmcjesdadc1/kc705/system_bd.tcl index 89b740c9ca..89bf638409 100644 --- a/projects/fmcjesdadc1/kc705/system_bd.tcl +++ b/projects/fmcjesdadc1/kc705/system_bd.tcl @@ -7,15 +7,17 @@ source $ad_hdl_dir/projects/common/kc705/kc705_system_bd.tcl source ../common/fmcjesdadc1_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +NP=$ad_project_params(RX_JESD_NP)" + +sysid_gen_sys_init_file $sys_cstring ad_ip_parameter axi_ad9250_dma CONFIG.DMA_DATA_WIDTH_DEST 512 ad_ip_parameter axi_ad9250_dma CONFIG.FIFO_SIZE 32 - diff --git a/projects/fmcjesdadc1/vc707/system_bd.tcl b/projects/fmcjesdadc1/vc707/system_bd.tcl index db3dbfff88..f4bb508043 100644 --- a/projects/fmcjesdadc1/vc707/system_bd.tcl +++ b/projects/fmcjesdadc1/vc707/system_bd.tcl @@ -7,14 +7,17 @@ source $ad_hdl_dir/projects/common/vc707/vc707_system_bd.tcl source ../common/fmcjesdadc1_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +NP=$ad_project_params(RX_JESD_NP)" + +sysid_gen_sys_init_file $sys_cstring ad_ip_parameter axi_ad9250_dma CONFIG.DMA_DATA_WIDTH_DEST 256 ad_ip_parameter axi_ad9250_dma CONFIG.FIFO_SIZE 32 diff --git a/projects/fmcjesdadc1/zc706/system_bd.tcl b/projects/fmcjesdadc1/zc706/system_bd.tcl index 8ac9640f80..d21bac4a44 100644 --- a/projects/fmcjesdadc1/zc706/system_bd.tcl +++ b/projects/fmcjesdadc1/zc706/system_bd.tcl @@ -7,11 +7,14 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source ../common/fmcjesdadc1_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +NP=$ad_project_params(RX_JESD_NP)" + +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/fmcomms11/zc706/system_bd.tcl b/projects/fmcomms11/zc706/system_bd.tcl index 14a76aec9d..e59e6c8954 100644 --- a/projects/fmcomms11/zc706/system_bd.tcl +++ b/projects/fmcomms11/zc706/system_bd.tcl @@ -22,11 +22,12 @@ set adc_fifo_address_width 15 source ../common/fmcomms11_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width\ +ADC_FIFO_ADDR_WIDTH=$adc_fifo_address_width" + +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/fmcomms2/kc705/system_bd.tcl b/projects/fmcomms2/kc705/system_bd.tcl index fbe6c55d8c..f640983a6e 100644 --- a/projects/fmcomms2/kc705/system_bd.tcl +++ b/projects/fmcomms2/kc705/system_bd.tcl @@ -7,14 +7,11 @@ source $ad_hdl_dir/projects/common/kc705/kc705_system_bd.tcl source ../common/fmcomms2_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 31 - diff --git a/projects/fmcomms2/kcu105/system_bd.tcl b/projects/fmcomms2/kcu105/system_bd.tcl index 3e932bdaf9..bbd0925e3e 100644 --- a/projects/fmcomms2/kcu105/system_bd.tcl +++ b/projects/fmcomms2/kcu105/system_bd.tcl @@ -8,11 +8,9 @@ source $ad_hdl_dir/projects/common/kcu105/kcu105_system_mig.tcl source ../common/fmcomms2_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file @@ -20,4 +18,3 @@ sysid_gen_sys_init_file ad_ip_parameter util_ad9361_divclk CONFIG.SIM_DEVICE ULTRASCALE ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 11 - diff --git a/projects/fmcomms2/vc707/system_bd.tcl b/projects/fmcomms2/vc707/system_bd.tcl index 3cb673bd0e..1bd16552e4 100644 --- a/projects/fmcomms2/vc707/system_bd.tcl +++ b/projects/fmcomms2/vc707/system_bd.tcl @@ -7,14 +7,11 @@ source $ad_hdl_dir/projects/common/vc707/vc707_system_bd.tcl source ../common/fmcomms2_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 22 - diff --git a/projects/fmcomms2/zc702/system_bd.tcl b/projects/fmcomms2/zc702/system_bd.tcl index 197c575abf..1c8654b593 100644 --- a/projects/fmcomms2/zc702/system_bd.tcl +++ b/projects/fmcomms2/zc702/system_bd.tcl @@ -7,14 +7,11 @@ source $ad_hdl_dir/projects/common/zc702/zc702_system_bd.tcl source ../common/fmcomms2_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 23 - diff --git a/projects/fmcomms2/zc706/system_bd.tcl b/projects/fmcomms2/zc706/system_bd.tcl index 4e6496a428..4b47926a93 100644 --- a/projects/fmcomms2/zc706/system_bd.tcl +++ b/projects/fmcomms2/zc706/system_bd.tcl @@ -7,14 +7,11 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source ../common/fmcomms2_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 20 - diff --git a/projects/fmcomms2/zcu102/system_bd.tcl b/projects/fmcomms2/zcu102/system_bd.tcl index 1f3addccd0..379a41717a 100644 --- a/projects/fmcomms2/zcu102/system_bd.tcl +++ b/projects/fmcomms2/zcu102/system_bd.tcl @@ -7,11 +7,9 @@ source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source ../common/fmcomms2_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file @@ -20,4 +18,3 @@ ad_ip_parameter util_ad9361_divclk CONFIG.SIM_DEVICE ULTRASCALE ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 11 ad_ip_parameter axi_ad9361 CONFIG.DELAY_REFCLK_FREQUENCY 500 - diff --git a/projects/fmcomms2/zed/system_bd.tcl b/projects/fmcomms2/zed/system_bd.tcl index bb7ca20e8a..715cfd1c30 100644 --- a/projects/fmcomms2/zed/system_bd.tcl +++ b/projects/fmcomms2/zed/system_bd.tcl @@ -7,11 +7,9 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source ../common/fmcomms2_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file @@ -19,4 +17,3 @@ sysid_gen_sys_init_file ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 23 ad_ip_parameter axi_ad9361 CONFIG.TDD_DISABLE 1 - diff --git a/projects/fmcomms5/zc702/system_bd.tcl b/projects/fmcomms5/zc702/system_bd.tcl index f26297e40a..bf7331036f 100644 --- a/projects/fmcomms5/zc702/system_bd.tcl +++ b/projects/fmcomms5/zc702/system_bd.tcl @@ -6,11 +6,9 @@ source $ad_hdl_dir/projects/common/zc702/zc702_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file @@ -26,4 +24,3 @@ ad_ip_parameter axi_ad9361_0 CONFIG.ADC_INIT_DELAY 24 ad_ip_parameter axi_ad9361_1 CONFIG.ADC_INIT_DELAY 24 ad_ip_parameter axi_ad9361_adc_dma CONFIG.AXI_SLICE_DEST 1 ad_ip_parameter axi_ad9361_dac_dma CONFIG.AXI_SLICE_SRC 1 - diff --git a/projects/fmcomms5/zc706/system_bd.tcl b/projects/fmcomms5/zc706/system_bd.tcl index a0769d90ea..b933970e3a 100644 --- a/projects/fmcomms5/zc706/system_bd.tcl +++ b/projects/fmcomms5/zc706/system_bd.tcl @@ -6,11 +6,9 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file @@ -22,4 +20,3 @@ source ../common/fmcomms5_bd.tcl ad_ip_parameter axi_ad9361_0 CONFIG.ADC_INIT_DELAY 16 ad_ip_parameter axi_ad9361_1 CONFIG.ADC_INIT_DELAY 16 - diff --git a/projects/fmcomms5/zcu102/system_bd.tcl b/projects/fmcomms5/zcu102/system_bd.tcl index 66d82e7948..7c9a6fabc7 100644 --- a/projects/fmcomms5/zcu102/system_bd.tcl +++ b/projects/fmcomms5/zcu102/system_bd.tcl @@ -7,11 +7,9 @@ source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source ../common/fmcomms5_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/fmcomms8/a10soc/system_qsys.tcl b/projects/fmcomms8/a10soc/system_qsys.tcl index 68b853a3d7..2e147b7f86 100755 --- a/projects/fmcomms8/a10soc/system_qsys.tcl +++ b/projects/fmcomms8/a10soc/system_qsys.tcl @@ -4,6 +4,7 @@ ############################################################################### set dac_fifo_address_width 16 + source $ad_hdl_dir/projects/scripts/adi_pd.tcl source $ad_hdl_dir/projects/common/a10soc/a10soc_system_qsys.tcl source $ad_hdl_dir/projects/common/a10soc/a10soc_plddr4_dacfifo_qsys.tcl @@ -16,10 +17,9 @@ if [info exists ad_project_dir] { #system ID set_instance_parameter_value axi_sysid_0 {ROM_ADDR_BITS} {9} +set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "$mem_init_sys_file_path/mem_init_sys.txt" set_instance_parameter_value rom_sys_0 {ROM_ADDR_BITS} {9} -set_instance_parameter_value rom_sys_0 {PATH_TO_FILE} "[pwd]/mem_init_sys.txt" - -set sys_cstring "sys rom custom string placeholder"; -sysid_gen_sys_init_file $sys_cstring; +set sys_cstring "DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width"; +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/fmcomms8/zcu102/system_bd.tcl b/projects/fmcomms8/zcu102/system_bd.tcl index d642243584..9897a2a70e 100644 --- a/projects/fmcomms8/zcu102/system_bd.tcl +++ b/projects/fmcomms8/zcu102/system_bd.tcl @@ -10,14 +10,23 @@ source $ad_hdl_dir/projects/scripts/adi_pd.tcl ## FIFO depth is 8Mb - 500k samples set dac_fifo_address_width 16 -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "RX:M=$ad_project_params(RX_JESD_M)\ +L=$ad_project_params(RX_JESD_L)\ +S=$ad_project_params(RX_JESD_S)\ +TX:M=$ad_project_params(TX_JESD_M)\ +L=$ad_project_params(TX_JESD_L)\ +S=$ad_project_params(TX_JESD_S)\ +RX_OS:M=$ad_project_params(RX_OS_JESD_M)\ +L=$ad_project_params(RX_OS_JESD_L)\ +S=$ad_project_params(RX_OS_JESD_S)\ +DAC_FIFO_ADDR_WIDTH=$dac_fifo_address_width" + +sysid_gen_sys_init_file $sys_cstring source ../common/fmcomms8_bd.tcl ad_ip_parameter sys_ps8 CONFIG.PSU__CRL_APB__PL1_REF_CTRL__FREQMHZ 300 diff --git a/projects/imageon/zed/system_bd.tcl b/projects/imageon/zed/system_bd.tcl index fcfe8c1b69..95cfc92677 100644 --- a/projects/imageon/zed/system_bd.tcl +++ b/projects/imageon/zed/system_bd.tcl @@ -7,11 +7,9 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source ../common/imageon_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/jupiter_sdr/system_bd.tcl b/projects/jupiter_sdr/system_bd.tcl index 50280339d4..0845bf9d92 100644 --- a/projects/jupiter_sdr/system_bd.tcl +++ b/projects/jupiter_sdr/system_bd.tcl @@ -600,11 +600,11 @@ ad_cpu_interrupt ps-12 mb-11 axi_adrv9001_rx2_dma/irq ad_cpu_interrupt ps-11 mb-6 axi_adrv9001_tx1_dma/irq ad_cpu_interrupt ps-10 mb-5 axi_adrv9001_tx2_dma/irq -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path" +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 -sysid_gen_sys_init_file +set sys_cstring "DEVICE=$p_device" + +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/pulsar_adc_pmdz/coraz7s/system_bd.tcl b/projects/pulsar_adc_pmdz/coraz7s/system_bd.tcl index be70162f0e..36bc70206c 100644 --- a/projects/pulsar_adc_pmdz/coraz7s/system_bd.tcl +++ b/projects/pulsar_adc_pmdz/coraz7s/system_bd.tcl @@ -7,11 +7,9 @@ source $ad_hdl_dir/projects/common/coraz7s/coraz7s_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl source ../common/pulsar_adc_pmdz_bd.tcl -set mem_init_sys_path [get_env_param ADI_PROJECT_DIR ""]mem_init_sys.txt; - #system ID ad_ip_parameter axi_sysid_0 CONFIG.ROM_ADDR_BITS 9 -ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "[pwd]/$mem_init_sys_path"; +ad_ip_parameter rom_sys_0 CONFIG.PATH_TO_FILE "$mem_init_sys_file_path/mem_init_sys.txt" ad_ip_parameter rom_sys_0 CONFIG.ROM_ADDR_BITS 9 sysid_gen_sys_init_file diff --git a/projects/scripts/adi_pd.tcl b/projects/scripts/adi_pd.tcl index e139d9f9e4..682ddfb19f 100644 --- a/projects/scripts/adi_pd.tcl +++ b/projects/scripts/adi_pd.tcl @@ -3,6 +3,13 @@ ### SPDX short identifier: ADIBSD ############################################################################### +## Initialize global variables + +set mem_init_sys_file_path [pwd] +if {[info exists ::env(ADI_PROJECT_DIR)]} { + set mem_init_sys_file_path $::env(ADI_PROJECT_DIR) +} + ## Converts a string input to hex and adds whitespace as padding to obtain the size defined by # the blocksize parameter. # @@ -95,8 +102,7 @@ proc rev_by_string {str} { # \param[custom_string] - string input # -proc sysid_gen_sys_init_file {{custom_string {}}} { - +proc sysid_gen_sys_init_file {{custom_string {}} {address_bits {9}}} { global project_name; if {[info exists project_name]} { puts "project_name: $project_name"; @@ -163,13 +169,14 @@ proc sysid_gen_sys_init_file {{custom_string {}}} { puts "boardname_string: $boardname_string"; puts "boardname_hex: $boardname_hex"; - set projname_string [string trimright [string trimright $project_name $boardname_string] _] + set projname_string [lindex [split [string trimright [string trimright $project_name $boardname_string] _] /] end] set projname_hex [hexstr_flip [stringtohex $projname_string 32]]; puts "projname_string: $projname_string"; puts "projname_hex: $projname_hex"; - set custom_hex [hexstr_flip [stringtohex $custom_string 64]]; + set custom_string_length [expr max(64, ([string length $custom_string] + 3) / 4 * 4)] + set custom_hex [hexstr_flip [stringtohex $custom_string $custom_string_length]]; puts "custom_string: $custom_string"; puts "custom_hex: $custom_hex"; @@ -197,15 +204,15 @@ proc sysid_gen_sys_init_file {{custom_string {}}} { set comh_hex [format %0-[expr [expr $table_size - 2] * 8]s $comh_hex]; append comh_hex "00000000" [checksum8bit $comh_hex] "000000"; - set sys_mem_hex [format %0-[expr 512 * 8]s [concat $comh_hex$verh_hex$projname_hex$boardname_hex$custom_hex]]; + set memory_size [expr int(pow(2, $address_bits)) * 8] + set sys_mem_hex [format %0-${memory_size}s [concat $comh_hex$verh_hex$projname_hex$boardname_hex$custom_hex]]; if {[info exists ::env(ADI_PROJECT_DIR)]} { - set mem_init_sys_file_path "$::env(ADI_PROJECT_DIR)mem_init_sys.txt"; + set mem_init_sys_file_path $::env(ADI_PROJECT_DIR)mem_init_sys.txt } else { - set mem_init_sys_file_path "mem_init_sys.txt"; + set mem_init_sys_file_path "mem_init_sys.txt" } - - set sys_mem_file [open $mem_init_sys_file_path "w"]; + set sys_mem_file [open ${mem_init_sys_file_path} "w"]; for {set i 0} {$i < [string length $sys_mem_hex]} {incr i} { if { ($i+1) % 8 == 0} { @@ -225,7 +232,13 @@ proc sysid_gen_sys_init_file {{custom_string {}}} { proc sysid_gen_pr_init_file {custom_string} { set custom_hex [stringtohex $custom_string 64]; - set pr_mem_file [open "mem_init_pr.txt" "w"]; + if {[info exists ::env(ADI_PROJECT_DIR)]} { + set mem_init_pr_file_path $::env(ADI_PROJECT_DIR)mem_init_pr.txt + } else { + set mem_init_pr_file_path "mem_init_pr.txt" + } + + set pr_mem_file [open $mem_init_pr_file_path "w"]; for {set i 0} {$i < [string length $custom_hex]} {incr i} { if { ($i+1) % 8 == 0} { puts $pr_mem_file [string index $custom_hex $i]; @@ -235,4 +248,3 @@ proc sysid_gen_pr_init_file {custom_string} { }; close $pr_mem_file; } - diff --git a/projects/sidekiqz2/system_bd.tcl b/projects/sidekiqz2/system_bd.tcl index a57c53bce6..f6066de564 100755 --- a/projects/sidekiqz2/system_bd.tcl +++ b/projects/sidekiqz2/system_bd.tcl @@ -11,4 +11,3 @@ ad_ip_parameter sys_ps7 CONFIG.PCW_GPIO_EMIO_GPIO_IO 19 set_property LEFT 18 [get_bd_ports /gpio_i] set_property LEFT 18 [get_bd_ports /gpio_o] set_property LEFT 18 [get_bd_ports /gpio_t] -