From 2701c8ab2683876a5d852a532c5074c30d8cc759 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 | 10 +++++-- projects/ad4630_fmc/zed/system_bd.tcl | 6 +++- projects/ad469x_fmc/zed/system_bd.tcl | 7 ++++- projects/ad5758_sdz/zed/system_bd.tcl | 1 - projects/ad5766_sdz/zed/system_bd.tcl | 1 - projects/ad6676evb/vc707/system_bd.tcl | 4 ++- projects/ad6676evb/zc706/system_bd.tcl | 4 ++- projects/ad738x_fmc/zed/system_bd.tcl | 22 ++++++++------ projects/ad7405_fmc/zed/system_bd.tcl | 24 ++++++++------- projects/ad7606x_fmc/zed/system_bd.tcl | 9 ++++-- projects/ad7616_sdz/zc706/system_bd.tcl | 9 ++++-- projects/ad7616_sdz/zed/system_bd.tcl | 9 ++++-- projects/ad77681evb/zed/system_bd.tcl | 1 - .../ad9081_fmca_ebz/a10soc/system_qsys.tcl | 16 +++++++++- projects/ad9081_fmca_ebz/vck190/system_bd.tcl | 21 +++++++++++-- projects/ad9081_fmca_ebz/vcu118/system_bd.tcl | 24 ++++++++++++--- projects/ad9081_fmca_ebz/vcu128/system_bd.tcl | 26 +++++++++++++--- projects/ad9081_fmca_ebz/zc706/system_bd.tcl | 15 +++++++++- projects/ad9081_fmca_ebz/zcu102/system_bd.tcl | 25 +++++++++++++--- .../zcu102/system_bd.tcl | 27 +++++++++++++---- projects/ad9082_fmca_ebz/vcu118/system_bd.tcl | 2 +- projects/ad9082_fmca_ebz/zc706/system_bd.tcl | 1 - projects/ad9082_fmca_ebz/zcu102/system_bd.tcl | 1 - projects/ad9083_evb/zcu102/system_bd.tcl | 9 +++--- projects/ad9083_vna/zcu102/system_bd.tcl | 9 +++--- projects/ad9208_dual_ebz/vcu118/system_bd.tcl | 2 -- projects/ad9656_fmc/zcu102/system_bd.tcl | 1 - projects/ad9695_fmc/zcu102/system_bd.tcl | 5 +++- projects/ad_fmclidar1_ebz/zc706/system_bd.tcl | 1 - .../ad_fmclidar1_ebz/zcu102/system_bd.tcl | 1 - .../ad_quadmxfe1_ebz/vcu118/system_bd.tcl | 30 +++++++++++++++---- projects/adaq7980_sdz/zed/system_bd.tcl | 5 ++-- projects/adrv9001/zc706/system_bd.tcl | 9 ++++-- projects/adrv9001/zcu102/system_bd.tcl | 9 ++++-- projects/adrv9001/zed/system_bd.tcl | 7 ++++- projects/adrv9009/zc706/system_bd.tcl | 12 +++++++- projects/adrv9009/zcu102/system_bd.tcl | 13 ++++++-- .../adrv9009zu11eg/adrv2crr_fmc/system_bd.tcl | 12 ++++++++ .../adrv2crr_fmcomms8/system_bd.tcl | 12 +++++++- .../adrv2crr_fmcxmwbr1/system_bd.tcl | 12 +++++++- .../adrv2crr_xmicrowave/system_bd.tcl | 12 +++++++- projects/adrv9371x/kcu105/system_bd.tcl | 13 ++++++-- projects/adrv9371x/zc706/system_bd.tcl | 13 ++++++-- projects/adrv9371x/zcu102/system_bd.tcl | 12 +++++++- projects/adv7511/zed/system_bd.tcl | 1 - projects/cn0506/zc706/system_bd.tcl | 2 ++ projects/cn0506/zcu102/system_bd.tcl | 2 ++ projects/cn0506/zed/system_bd.tcl | 2 ++ projects/cn0540/coraz7s/system_bd.tcl | 1 - projects/cn0577/zed/system_bd.tcl | 1 + projects/cn0579/coraz7s/system_bd.tcl | 1 + projects/dac_fmc_ebz/a10soc/system_qsys.tcl | 6 +++- projects/dac_fmc_ebz/vcu118/system_bd.tcl | 11 ++++++- projects/dac_fmc_ebz/zc706/system_bd.tcl | 11 ++++++- projects/dac_fmc_ebz/zcu102/system_bd.tcl | 12 ++++++-- projects/daq2/kc705/system_bd.tcl | 10 ++++++- projects/daq2/kcu105/system_bd.tcl | 10 ++++++- projects/daq2/zc706/system_bd.tcl | 10 ++++++- projects/daq2/zcu102/system_bd.tcl | 10 ++++++- projects/daq3/kcu105/system_bd.tcl | 9 +++++- projects/daq3/vcu118/system_bd.tcl | 9 +++++- projects/daq3/zc706/system_bd.tcl | 9 +++++- projects/daq3/zcu102/system_bd.tcl | 9 +++++- projects/fmcadc2/vc707/system_bd.tcl | 7 ++++- projects/fmcadc2/zc706/system_bd.tcl | 7 ++++- projects/fmcjesdadc1/kc705/system_bd.tcl | 8 +++-- projects/fmcjesdadc1/vc707/system_bd.tcl | 7 ++++- projects/fmcjesdadc1/zc706/system_bd.tcl | 7 ++++- projects/fmcomms2/kc705/system_bd.tcl | 1 - projects/fmcomms2/kcu105/system_bd.tcl | 1 - projects/fmcomms2/vc707/system_bd.tcl | 1 - projects/fmcomms2/zc702/system_bd.tcl | 1 - projects/fmcomms2/zc706/system_bd.tcl | 1 - projects/fmcomms2/zcu102/system_bd.tcl | 1 - projects/fmcomms2/zed/system_bd.tcl | 1 - projects/fmcomms5/zc702/system_bd.tcl | 1 - projects/fmcomms5/zc706/system_bd.tcl | 1 - projects/fmcomms8/zcu102/system_bd.tcl | 12 +++++++- projects/pluto_ng/system_bd.tcl | 4 ++- projects/scripts/adi_pd.tcl | 8 +++-- projects/sidekiqz2/system_bd.tcl | 1 - 81 files changed, 526 insertions(+), 134 deletions(-) diff --git a/projects/ad40xx_fmc/zed/system_bd.tcl b/projects/ad40xx_fmc/zed/system_bd.tcl index f239a769885..5497b39e1fb 100644 --- a/projects/ad40xx_fmc/zed/system_bd.tcl +++ b/projects/ad40xx_fmc/zed/system_bd.tcl @@ -24,6 +24,12 @@ 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 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/ad4630_fmc/zed/system_bd.tcl b/projects/ad4630_fmc/zed/system_bd.tcl index f488ddae946..6113a9c31a6 100644 --- a/projects/ad4630_fmc/zed/system_bd.tcl +++ b/projects/ad4630_fmc/zed/system_bd.tcl @@ -15,5 +15,9 @@ 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.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 a99776f6169..1fbb1050929 100644 --- a/projects/ad469x_fmc/zed/system_bd.tcl +++ b/projects/ad469x_fmc/zed/system_bd.tcl @@ -24,4 +24,9 @@ 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 +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)" +sysid_gen_sys_init_file $sys_cstring \ No newline at end of file diff --git a/projects/ad5758_sdz/zed/system_bd.tcl b/projects/ad5758_sdz/zed/system_bd.tcl index d6cc9cc22d4..b9ac4b7e98a 100644 --- a/projects/ad5758_sdz/zed/system_bd.tcl +++ b/projects/ad5758_sdz/zed/system_bd.tcl @@ -9,4 +9,3 @@ 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 - diff --git a/projects/ad5766_sdz/zed/system_bd.tcl b/projects/ad5766_sdz/zed/system_bd.tcl index 6d2b2cc483d..569f1a1a466 100644 --- a/projects/ad5766_sdz/zed/system_bd.tcl +++ b/projects/ad5766_sdz/zed/system_bd.tcl @@ -11,4 +11,3 @@ 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 11a782cb7c7..f973c65f02e 100644 --- a/projects/ad6676evb/vc707/system_bd.tcl +++ b/projects/ad6676evb/vc707/system_bd.tcl @@ -9,4 +9,6 @@ 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 +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 7ad1f7690ff..71a68d650c1 100644 --- a/projects/ad6676evb/zc706/system_bd.tcl +++ b/projects/ad6676evb/zc706/system_bd.tcl @@ -9,4 +9,6 @@ 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 +set sys_cstring "RX:L=$ad_project_params(RX_JESD_L)" + +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad738x_fmc/zed/system_bd.tcl b/projects/ad738x_fmc/zed/system_bd.tcl index 579810d16de..bfcd51233eb 100644 --- a/projects/ad738x_fmc/zed/system_bd.tcl +++ b/projects/ad738x_fmc/zed/system_bd.tcl @@ -1,15 +1,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 @@ -22,5 +13,18 @@ set adc_num_of_channels 2 set adc_sampling_rate 3000000 +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.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 c7e7fd769f7..725c3c5be3c 100644 --- a/projects/ad7405_fmc/zed/system_bd.tcl +++ b/projects/ad7405_fmc/zed/system_bd.tcl @@ -1,15 +1,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 @@ -25,5 +16,18 @@ set clkgen_vco_mul 50 set ext_clk_rate 25 -source ../common/ad7405_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.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 fcab16572b2..316c023fcf8 100644 --- a/projects/ad7606x_fmc/zed/system_bd.tcl +++ b/projects/ad7606x_fmc/zed/system_bd.tcl @@ -4,10 +4,15 @@ source $ad_hdl_dir/projects/scripts/adi_pd.tcl source ../common/ad7606x_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.txt" +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 "$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 80e5cb954a3..8b4f153c16d 100644 --- a/projects/ad7616_sdz/zc706/system_bd.tcl +++ b/projects/ad7616_sdz/zc706/system_bd.tcl @@ -8,7 +8,10 @@ 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 - -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 10f2d4d5e5a..febc38731b6 100644 --- a/projects/ad7616_sdz/zed/system_bd.tcl +++ b/projects/ad7616_sdz/zed/system_bd.tcl @@ -8,7 +8,10 @@ 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 - -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 160e0c15082..f25c3c3ffbb 100644 --- a/projects/ad77681evb/zed/system_bd.tcl +++ b/projects/ad77681evb/zed/system_bd.tcl @@ -11,4 +11,3 @@ 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/ad9081_fmca_ebz/a10soc/system_qsys.tcl b/projects/ad9081_fmca_ebz/a10soc/system_qsys.tcl index 37cecbfbb12..e01b83b1ba1 100755 --- a/projects/ad9081_fmca_ebz/a10soc/system_qsys.tcl +++ b/projects/ad9081_fmca_ebz/a10soc/system_qsys.tcl @@ -21,5 +21,19 @@ 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 ceea67ca3ea..8d1c87ff9bd 100644 --- a/projects/ad9081_fmca_ebz/vck190/system_bd.tcl +++ b/projects/ad9081_fmca_ebz/vck190/system_bd.tcl @@ -16,9 +16,24 @@ 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 axi_sysid_0 CONFIG.ROM_ADDR_BITS 10 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 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)\ +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 aa8bc8ed78f..b352970d313 100644 --- a/projects/ad9081_fmca_ebz/vcu118/system_bd.tcl +++ b/projects/ad9081_fmca_ebz/vcu118/system_bd.tcl @@ -15,11 +15,27 @@ 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 axi_sysid_0 CONFIG.ROM_ADDR_BITS 10 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 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 39c156c507b..318cc5108f1 100644 --- a/projects/ad9081_fmca_ebz/vcu128/system_bd.tcl +++ b/projects/ad9081_fmca_ebz/vcu128/system_bd.tcl @@ -27,11 +27,29 @@ 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 axi_sysid_0 CONFIG.ROM_ADDR_BITS 10 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 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 5313ac0f641..3f44c572dae 100644 --- a/projects/ad9081_fmca_ebz/zc706/system_bd.tcl +++ b/projects/ad9081_fmca_ebz/zc706/system_bd.tcl @@ -17,5 +17,18 @@ 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 +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 84e30abd1b4..89e2041d768 100644 --- a/projects/ad9081_fmca_ebz/zcu102/system_bd.tcl +++ b/projects/ad9081_fmca_ebz/zcu102/system_bd.tcl @@ -16,11 +16,29 @@ 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 axi_sysid_0 CONFIG.ROM_ADDR_BITS 10 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 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 @@ -66,4 +84,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 6bf64d98f9b..334dedef732 100644 --- a/projects/ad9081_fmca_ebz_x_band/zcu102/system_bd.tcl +++ b/projects/ad9081_fmca_ebz_x_band/zcu102/system_bd.tcl @@ -14,11 +14,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 axi_sysid_0 CONFIG.ROM_ADDR_BITS 10 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 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 @@ -150,4 +168,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 1a278f6e121..d7b1dd2c027 100644 --- a/projects/ad9082_fmca_ebz/vcu118/system_bd.tcl +++ b/projects/ad9082_fmca_ebz/vcu118/system_bd.tcl @@ -1 +1 @@ -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/ad9082_fmca_ebz/zc706/system_bd.tcl b/projects/ad9082_fmca_ebz/zc706/system_bd.tcl index 6dbb75c4656..23fb427d3e0 100644 --- a/projects/ad9082_fmca_ebz/zc706/system_bd.tcl +++ b/projects/ad9082_fmca_ebz/zc706/system_bd.tcl @@ -1,2 +1 @@ source $ad_hdl_dir/projects/ad9081_fmca_ebz/zc706/system_bd.tcl - diff --git a/projects/ad9082_fmca_ebz/zcu102/system_bd.tcl b/projects/ad9082_fmca_ebz/zcu102/system_bd.tcl index c9d52baeacc..7730a61cd26 100644 --- a/projects/ad9082_fmca_ebz/zcu102/system_bd.tcl +++ b/projects/ad9082_fmca_ebz/zcu102/system_bd.tcl @@ -1,2 +1 @@ source $ad_hdl_dir/projects/ad9081_fmca_ebz/zcu102/system_bd.tcl - diff --git a/projects/ad9083_evb/zcu102/system_bd.tcl b/projects/ad9083_evb/zcu102/system_bd.tcl index 92107df5b44..c9424362d35 100644 --- a/projects/ad9083_evb/zcu102/system_bd.tcl +++ b/projects/ad9083_evb/zcu102/system_bd.tcl @@ -8,8 +8,9 @@ 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.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 583c6e004c0..ba30f493bb3 100644 --- a/projects/ad9083_vna/zcu102/system_bd.tcl +++ b/projects/ad9083_vna/zcu102/system_bd.tcl @@ -1,4 +1,3 @@ - source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source $ad_hdl_dir/projects/scripts/adi_pd.tcl @@ -8,7 +7,9 @@ source ../common/ad9083_vna_bd.tcl 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 -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 345b6646eec..6fd50128054 100644 --- a/projects/ad9208_dual_ebz/vcu118/system_bd.tcl +++ b/projects/ad9208_dual_ebz/vcu118/system_bd.tcl @@ -34,5 +34,3 @@ foreach i {0 1} { ad_ip_parameter util_adc_${i}_xcvr CONFIG.PPF0_CFG 0xB00 } - - diff --git a/projects/ad9656_fmc/zcu102/system_bd.tcl b/projects/ad9656_fmc/zcu102/system_bd.tcl index 807c57b5410..839c5fec504 100644 --- a/projects/ad9656_fmc/zcu102/system_bd.tcl +++ b/projects/ad9656_fmc/zcu102/system_bd.tcl @@ -12,4 +12,3 @@ 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 c9de5cc8279..437b594640c 100644 --- a/projects/ad9695_fmc/zcu102/system_bd.tcl +++ b/projects/ad9695_fmc/zcu102/system_bd.tcl @@ -8,5 +8,8 @@ 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.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/ad_fmclidar1_ebz/zc706/system_bd.tcl b/projects/ad_fmclidar1_ebz/zc706/system_bd.tcl index a4cf4154ff7..a676c7817c7 100644 --- a/projects/ad_fmclidar1_ebz/zc706/system_bd.tcl +++ b/projects/ad_fmclidar1_ebz/zc706/system_bd.tcl @@ -43,4 +43,3 @@ 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 - diff --git a/projects/ad_fmclidar1_ebz/zcu102/system_bd.tcl b/projects/ad_fmclidar1_ebz/zcu102/system_bd.tcl index a932691a958..c29a46e7666 100644 --- a/projects/ad_fmclidar1_ebz/zcu102/system_bd.tcl +++ b/projects/ad_fmclidar1_ebz/zcu102/system_bd.tcl @@ -45,4 +45,3 @@ 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 - diff --git a/projects/ad_quadmxfe1_ebz/vcu118/system_bd.tcl b/projects/ad_quadmxfe1_ebz/vcu118/system_bd.tcl index 677b6548bee..dd6fdcb6aa9 100644 --- a/projects/ad_quadmxfe1_ebz/vcu118/system_bd.tcl +++ b/projects/ad_quadmxfe1_ebz/vcu118/system_bd.tcl @@ -15,11 +15,31 @@ 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 "[pwd]/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 30878fc9a3c..749c6e103e5 100644 --- a/projects/adaq7980_sdz/zed/system_bd.tcl +++ b/projects/adaq7980_sdz/zed/system_bd.tcl @@ -8,10 +8,11 @@ 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 +set sys_cstring "ADC_SAMPLING_RATE=$adc_sampling_rate" + +sysid_gen_sys_init_file $sys_cstring # specify ADC sampling rate in samples/seconds -- default is 1 MSPS set adc_sampling_rate 1000000 source ../common/adaq7980_bd.tcl - diff --git a/projects/adrv9001/zc706/system_bd.tcl b/projects/adrv9001/zc706/system_bd.tcl index 64e39b5274c..c89aa5e1a3c 100644 --- a/projects/adrv9001/zc706/system_bd.tcl +++ b/projects/adrv9001/zc706/system_bd.tcl @@ -8,6 +8,11 @@ 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.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 d8241628d3a..a4bcc98a37c 100644 --- a/projects/adrv9001/zcu102/system_bd.tcl +++ b/projects/adrv9001/zcu102/system_bd.tcl @@ -10,8 +10,13 @@ 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.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 9b01b26d7e3..454a7cf2db4 100644 --- a/projects/adrv9001/zed/system_bd.tcl +++ b/projects/adrv9001/zed/system_bd.tcl @@ -12,5 +12,10 @@ 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 +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/zc706/system_bd.tcl b/projects/adrv9009/zc706/system_bd.tcl index 2ef85ed4839..2c4667a848b 100644 --- a/projects/adrv9009/zc706/system_bd.tcl +++ b/projects/adrv9009/zc706/system_bd.tcl @@ -11,7 +11,17 @@ 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 +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_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 e55048302a8..fcdf9da0190 100644 --- a/projects/adrv9009/zcu102/system_bd.tcl +++ b/projects/adrv9009/zcu102/system_bd.tcl @@ -14,7 +14,17 @@ 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 +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_mem_hp0_interconnect sys_cpu_clk sys_ps8/S_AXI_HP0 @@ -29,4 +39,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 25bc78e1dbb..446776a8ae8 100644 --- a/projects/adrv9009zu11eg/adrv2crr_fmc/system_bd.tcl +++ b/projects/adrv9009zu11eg/adrv2crr_fmc/system_bd.tcl @@ -8,4 +8,16 @@ 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 "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 21035839bbc..8cfc0159c23 100644 --- a/projects/adrv9009zu11eg/adrv2crr_fmcomms8/system_bd.tcl +++ b/projects/adrv9009zu11eg/adrv2crr_fmcomms8/system_bd.tcl @@ -81,7 +81,17 @@ 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 +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 e1b6c4ff4cb..b94cea81649 100755 --- a/projects/adrv9009zu11eg/adrv2crr_fmcxmwbr1/system_bd.tcl +++ b/projects/adrv9009zu11eg/adrv2crr_fmcxmwbr1/system_bd.tcl @@ -8,7 +8,17 @@ 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 +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 5f4f0f24748..32c47269ab4 100755 --- a/projects/adrv9009zu11eg/adrv2crr_xmicrowave/system_bd.tcl +++ b/projects/adrv9009zu11eg/adrv2crr_xmicrowave/system_bd.tcl @@ -8,7 +8,17 @@ 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 +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/adrv9371x/kcu105/system_bd.tcl b/projects/adrv9371x/kcu105/system_bd.tcl index be1efe8e819..20b5ccc7eb7 100644 --- a/projects/adrv9371x/kcu105/system_bd.tcl +++ b/projects/adrv9371x/kcu105/system_bd.tcl @@ -15,7 +15,17 @@ 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 +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_ip_parameter axi_ddr_cntrl CONFIG.ADDN_UI_CLKOUT3_FREQ_HZ 200 @@ -26,4 +36,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 5cc68bc2aa2..58f325e118b 100644 --- a/projects/adrv9371x/zc706/system_bd.tcl +++ b/projects/adrv9371x/zc706/system_bd.tcl @@ -11,9 +11,18 @@ 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 +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_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 334d5c538bf..cff1a1fe27a 100644 --- a/projects/adrv9371x/zcu102/system_bd.tcl +++ b/projects/adrv9371x/zcu102/system_bd.tcl @@ -14,7 +14,17 @@ 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 +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_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/zed/system_bd.tcl b/projects/adv7511/zed/system_bd.tcl index d6cc9cc22d4..b9ac4b7e98a 100644 --- a/projects/adv7511/zed/system_bd.tcl +++ b/projects/adv7511/zed/system_bd.tcl @@ -9,4 +9,3 @@ 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 - diff --git a/projects/cn0506/zc706/system_bd.tcl b/projects/cn0506/zc706/system_bd.tcl index 8d176597bac..6425f7a6b9a 100644 --- a/projects/cn0506/zc706/system_bd.tcl +++ b/projects/cn0506/zc706/system_bd.tcl @@ -118,6 +118,8 @@ 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.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 51c764a1770..8d680fb79a3 100644 --- a/projects/cn0506/zcu102/system_bd.tcl +++ b/projects/cn0506/zcu102/system_bd.tcl @@ -132,6 +132,8 @@ 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.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 c4b1982d4a4..0849dab09fb 100644 --- a/projects/cn0506/zed/system_bd.tcl +++ b/projects/cn0506/zed/system_bd.tcl @@ -118,6 +118,8 @@ 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.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 022e0a19151..22c47fe2dbb 100755 --- a/projects/cn0540/coraz7s/system_bd.tcl +++ b/projects/cn0540/coraz7s/system_bd.tcl @@ -13,4 +13,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/cn0577/zed/system_bd.tcl b/projects/cn0577/zed/system_bd.tcl index d2bd038f3a6..619efd89d90 100644 --- a/projects/cn0577/zed/system_bd.tcl +++ b/projects/cn0577/zed/system_bd.tcl @@ -12,4 +12,5 @@ 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 diff --git a/projects/cn0579/coraz7s/system_bd.tcl b/projects/cn0579/coraz7s/system_bd.tcl index 0e1b2817cd7..4a68283add0 100644 --- a/projects/cn0579/coraz7s/system_bd.tcl +++ b/projects/cn0579/coraz7s/system_bd.tcl @@ -7,6 +7,7 @@ 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 set sys_cstring "sys rom custom string placeholder" + sysid_gen_sys_init_file $sys_cstring source ../common/cn0579_bd.tcl diff --git a/projects/dac_fmc_ebz/a10soc/system_qsys.tcl b/projects/dac_fmc_ebz/a10soc/system_qsys.tcl index 8179fd2f84f..4f71bb1e891 100644 --- a/projects/dac_fmc_ebz/a10soc/system_qsys.tcl +++ b/projects/dac_fmc_ebz/a10soc/system_qsys.tcl @@ -48,5 +48,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" -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)" +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 48d8d0c6dfc..b4311a112fb 100755 --- a/projects/dac_fmc_ebz/vcu118/system_bd.tcl +++ b/projects/dac_fmc_ebz/vcu118/system_bd.tcl @@ -11,9 +11,18 @@ 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.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" + 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 caba859e4cf..090b972dfab 100644 --- a/projects/dac_fmc_ebz/zc706/system_bd.tcl +++ b/projects/dac_fmc_ebz/zc706/system_bd.tcl @@ -46,9 +46,18 @@ 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.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" + 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 a32bf734fa3..17c105876a1 100644 --- a/projects/dac_fmc_ebz/zcu102/system_bd.tcl +++ b/projects/dac_fmc_ebz/zcu102/system_bd.tcl @@ -33,8 +33,16 @@ 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.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" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/daq2/kc705/system_bd.tcl b/projects/daq2/kc705/system_bd.tcl index f80365451ee..a69319631b3 100644 --- a/projects/daq2/kc705/system_bd.tcl +++ b/projects/daq2/kc705/system_bd.tcl @@ -20,5 +20,13 @@ 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 "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\ +DAC_OFFLOAD_TYPE=$dac_offload_type" + sysid_gen_sys_init_file $sys_cstring diff --git a/projects/daq2/kcu105/system_bd.tcl b/projects/daq2/kcu105/system_bd.tcl index 8165201fbeb..94b919b7452 100644 --- a/projects/daq2/kcu105/system_bd.tcl +++ b/projects/daq2/kcu105/system_bd.tcl @@ -20,7 +20,15 @@ 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 "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\ +DAC_OFFLOAD_TYPE=$dac_offload_type" + 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 16650046be5..6fceb2cf213 100644 --- a/projects/daq2/zc706/system_bd.tcl +++ b/projects/daq2/zc706/system_bd.tcl @@ -66,5 +66,13 @@ 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 "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\ +DAC_OFFLOAD_TYPE=$dac_offload_type" + sysid_gen_sys_init_file $sys_cstring diff --git a/projects/daq2/zcu102/system_bd.tcl b/projects/daq2/zcu102/system_bd.tcl index 26f27e334bb..fc2b3d2f91e 100644 --- a/projects/daq2/zcu102/system_bd.tcl +++ b/projects/daq2/zcu102/system_bd.tcl @@ -20,7 +20,15 @@ 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 "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\ +DAC_OFFLOAD_TYPE=$dac_offload_type" + 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 45fa146d530..d768b576679 100644 --- a/projects/daq3/kcu105/system_bd.tcl +++ b/projects/daq3/kcu105/system_bd.tcl @@ -19,7 +19,14 @@ 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 +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)" + +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 31355e7f0cc..01f34bffcad 100644 --- a/projects/daq3/vcu118/system_bd.tcl +++ b/projects/daq3/vcu118/system_bd.tcl @@ -18,7 +18,14 @@ 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 +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)" + +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 046a652e963..56a1d16f4f8 100644 --- a/projects/daq3/zc706/system_bd.tcl +++ b/projects/daq3/zc706/system_bd.tcl @@ -19,4 +19,11 @@ 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 +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)" + +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/daq3/zcu102/system_bd.tcl b/projects/daq3/zcu102/system_bd.tcl index dc8babe93dd..83a91339824 100644 --- a/projects/daq3/zcu102/system_bd.tcl +++ b/projects/daq3/zcu102/system_bd.tcl @@ -15,7 +15,14 @@ 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 +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)" + +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 0527da77264..25d1bbd16b0 100644 --- a/projects/fmcadc2/vc707/system_bd.tcl +++ b/projects/fmcadc2/vc707/system_bd.tcl @@ -15,4 +15,9 @@ 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 +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/fmcadc2/zc706/system_bd.tcl b/projects/fmcadc2/zc706/system_bd.tcl index e70930a6a41..75ad0723c0c 100644 --- a/projects/fmcadc2/zc706/system_bd.tcl +++ b/projects/fmcadc2/zc706/system_bd.tcl @@ -12,4 +12,9 @@ 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 +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/fmcjesdadc1/kc705/system_bd.tcl b/projects/fmcjesdadc1/kc705/system_bd.tcl index 6e491aef90d..bf769957af9 100644 --- a/projects/fmcjesdadc1/kc705/system_bd.tcl +++ b/projects/fmcjesdadc1/kc705/system_bd.tcl @@ -9,8 +9,12 @@ 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 +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 883ae66d766..9e2769d1aab 100644 --- a/projects/fmcjesdadc1/vc707/system_bd.tcl +++ b/projects/fmcjesdadc1/vc707/system_bd.tcl @@ -9,7 +9,12 @@ 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 +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 ca9ed97ecf6..50a1a59504c 100644 --- a/projects/fmcjesdadc1/zc706/system_bd.tcl +++ b/projects/fmcjesdadc1/zc706/system_bd.tcl @@ -9,4 +9,9 @@ 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 +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/fmcomms2/kc705/system_bd.tcl b/projects/fmcomms2/kc705/system_bd.tcl index ee9c2290062..455aba9b64b 100644 --- a/projects/fmcomms2/kc705/system_bd.tcl +++ b/projects/fmcomms2/kc705/system_bd.tcl @@ -12,4 +12,3 @@ 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 88dd76c4a70..e6024a508de 100644 --- a/projects/fmcomms2/kcu105/system_bd.tcl +++ b/projects/fmcomms2/kcu105/system_bd.tcl @@ -15,4 +15,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 2a4445c58ec..98378a8b7b2 100644 --- a/projects/fmcomms2/vc707/system_bd.tcl +++ b/projects/fmcomms2/vc707/system_bd.tcl @@ -12,4 +12,3 @@ 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 f24619ac729..ac979c7557b 100644 --- a/projects/fmcomms2/zc702/system_bd.tcl +++ b/projects/fmcomms2/zc702/system_bd.tcl @@ -12,4 +12,3 @@ 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 1c77813d210..fa9af965924 100644 --- a/projects/fmcomms2/zc706/system_bd.tcl +++ b/projects/fmcomms2/zc706/system_bd.tcl @@ -12,4 +12,3 @@ 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 ae6af6a5cc0..917d2f6f548 100644 --- a/projects/fmcomms2/zcu102/system_bd.tcl +++ b/projects/fmcomms2/zcu102/system_bd.tcl @@ -15,4 +15,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 90633c2a3d4..df80c3bc794 100644 --- a/projects/fmcomms2/zed/system_bd.tcl +++ b/projects/fmcomms2/zed/system_bd.tcl @@ -14,4 +14,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 a2ddbbf3687..d46d852ac7b 100644 --- a/projects/fmcomms5/zc702/system_bd.tcl +++ b/projects/fmcomms5/zc702/system_bd.tcl @@ -21,4 +21,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 2668b7e514f..b9ee798e379 100644 --- a/projects/fmcomms5/zc706/system_bd.tcl +++ b/projects/fmcomms5/zc706/system_bd.tcl @@ -17,4 +17,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/fmcomms8/zcu102/system_bd.tcl b/projects/fmcomms8/zcu102/system_bd.tcl index 4f0910d813a..a24a74067f4 100644 --- a/projects/fmcomms8/zcu102/system_bd.tcl +++ b/projects/fmcomms8/zcu102/system_bd.tcl @@ -12,7 +12,17 @@ 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 +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 source ../common/fmcomms8_bd.tcl ad_ip_parameter sys_ps8 CONFIG.PSU__CRL_APB__PL1_REF_CTRL__FREQMHZ 300 diff --git a/projects/pluto_ng/system_bd.tcl b/projects/pluto_ng/system_bd.tcl index 9f62a5d35d2..d66280ee2d9 100644 --- a/projects/pluto_ng/system_bd.tcl +++ b/projects/pluto_ng/system_bd.tcl @@ -601,4 +601,6 @@ 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 +set sys_cstring "DEVICE=$p_device" + +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/scripts/adi_pd.tcl b/projects/scripts/adi_pd.tcl index 64eb2a5cd58..7f4b13ca908 100644 --- a/projects/scripts/adi_pd.tcl +++ b/projects/scripts/adi_pd.tcl @@ -90,7 +90,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]} { @@ -164,7 +164,8 @@ proc sysid_gen_sys_init_file {{custom_string {}}} { 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"; @@ -192,7 +193,8 @@ 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"; diff --git a/projects/sidekiqz2/system_bd.tcl b/projects/sidekiqz2/system_bd.tcl index dbaee2142a7..ae36ec89355 100755 --- a/projects/sidekiqz2/system_bd.tcl +++ b/projects/sidekiqz2/system_bd.tcl @@ -7,4 +7,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] -