From 0680e4433029c3d3270412f84a9b36f09d3fa5e7 Mon Sep 17 00:00:00 2001 From: Arpadi Date: Fri, 28 Jun 2019 11:41:21 +0300 Subject: [PATCH] system_id: deployed ip --- library/Makefile | 4 ++++ projects/ad40xx_fmc/zed/Makefile | 2 ++ projects/ad40xx_fmc/zed/system_bd.tcl | 7 +++++++ projects/ad5758_sdz/zed/Makefile | 2 ++ projects/ad5758_sdz/zed/system_bd.tcl | 7 +++++++ projects/ad5766_sdz/zed/Makefile | 2 ++ projects/ad5766_sdz/zed/system_bd.tcl | 8 ++++++++ projects/ad6676evb/vc707/Makefile | 2 ++ projects/ad6676evb/vc707/system_bd.tcl | 7 ++++++- projects/ad6676evb/zc706/Makefile | 2 ++ projects/ad6676evb/zc706/system_bd.tcl | 7 ++++++- projects/ad7134_fmc/zed/Makefile | 2 ++ projects/ad7134_fmc/zed/system_bd.tcl | 8 +++++++- projects/ad738x_fmc/zed/Makefile | 2 ++ projects/ad738x_fmc/zed/system_bd.tcl | 7 +++++++ projects/ad7405_fmc/zed/Makefile | 2 ++ projects/ad7405_fmc/zed/system_bd.tcl | 7 +++++++ projects/ad7616_sdz/zc706/Makefile | 2 ++ projects/ad7616_sdz/zc706/system_bd.tcl | 8 ++++++++ projects/ad7616_sdz/zed/Makefile | 2 ++ projects/ad7616_sdz/zed/system_bd.tcl | 8 ++++++++ projects/ad77681evb/zed/Makefile | 2 ++ projects/ad77681evb/zed/system_bd.tcl | 8 ++++++++ projects/ad7768evb/zed/Makefile | 2 ++ projects/ad7768evb/zed/system_bd.tcl | 8 ++++++++ projects/ad9208_dual_ebz/vcu118/Makefile | 2 ++ projects/ad9208_dual_ebz/vcu118/system_bd.tcl | 7 +++++++ projects/ad9265_fmc/zc706/Makefile | 2 ++ projects/ad9265_fmc/zc706/system_bd.tcl | 7 +++++++ projects/ad9434_fmc/zc706/Makefile | 2 ++ projects/ad9434_fmc/zc706/system_bd.tcl | 6 ++++++ projects/ad9467_fmc/kc705/Makefile | 2 ++ projects/ad9467_fmc/kc705/system_bd.tcl | 7 +++++++ projects/ad9467_fmc/zed/Makefile | 2 ++ projects/ad9467_fmc/zed/system_bd.tcl | 7 +++++++ projects/ad9739a_fmc/zc706/Makefile | 2 ++ projects/ad9739a_fmc/zc706/system_bd.tcl | 6 ++++++ projects/adaq7980_sdz/zed/Makefile | 2 ++ projects/adaq7980_sdz/zed/system_bd.tcl | 7 +++++++ projects/adrv9009/zc706/Makefile | 2 ++ projects/adrv9009/zc706/system_bd.tcl | 7 +++++++ projects/adrv9009/zcu102/Makefile | 2 ++ projects/adrv9009/zcu102/system_bd.tcl | 7 +++++++ projects/adrv9371x/kcu105/Makefile | 2 ++ projects/adrv9371x/kcu105/system_bd.tcl | 9 +++++++++ projects/adrv9371x/zc706/Makefile | 2 ++ projects/adrv9371x/zc706/system_bd.tcl | 9 +++++++++ projects/adrv9371x/zcu102/Makefile | 2 ++ projects/adrv9371x/zcu102/system_bd.tcl | 12 +++++++++++- projects/adv7511/zc702/Makefile | 2 ++ projects/adv7511/zc702/system_bd.tcl | 6 ++++++ projects/adv7511/zc706/Makefile | 2 ++ projects/adv7511/zc706/system_bd.tcl | 6 ++++++ projects/cn0363/zed/Makefile | 2 ++ projects/cn0363/zed/system_bd.tcl | 7 +++++++ projects/common/ac701/ac701_system_bd.tcl | 10 ++++++++++ projects/common/kc705/kc705_system_bd.tcl | 10 ++++++++++ projects/common/kcu105/kcu105_system_bd.tcl | 10 ++++++++++ projects/common/microzed/microzed_system_bd.tcl | 10 ++++++++++ projects/common/vc707/vc707_system_bd.tcl | 10 ++++++++++ projects/common/vcu118/vcu118_system_bd.tcl | 10 ++++++++++ projects/common/zc702/zc702_system_bd.tcl | 10 ++++++++++ projects/common/zc706/zc706_system_bd.tcl | 10 ++++++++++ projects/common/zcu102/zcu102_system_bd.tcl | 12 +++++++++++- projects/common/zed/zed_system_bd.tcl | 1 + projects/dac_fmc_ebz/zc706/Makefile | 2 ++ projects/dac_fmc_ebz/zc706/system_bd.tcl | 7 +++++++ projects/dac_fmc_ebz/zcu102/Makefile | 2 ++ projects/dac_fmc_ebz/zcu102/system_bd.tcl | 7 +++++++ projects/daq2/kc705/Makefile | 2 ++ projects/daq2/kc705/system_bd.tcl | 6 ++++++ projects/daq2/kcu105/Makefile | 2 ++ projects/daq2/kcu105/system_bd.tcl | 7 +++++++ projects/daq2/zc706/Makefile | 2 ++ projects/daq2/zc706/system_bd.tcl | 6 ++++++ projects/daq2/zcu102/Makefile | 2 ++ projects/daq2/zcu102/system_bd.tcl | 7 +++++++ projects/daq3/kcu105/Makefile | 2 ++ projects/daq3/kcu105/system_bd.tcl | 7 +++++++ projects/daq3/vcu118/Makefile | 2 ++ projects/daq3/vcu118/system_bd.tcl | 8 +++++++- projects/daq3/zc706/Makefile | 2 ++ projects/daq3/zc706/system_bd.tcl | 6 ++++++ projects/daq3/zcu102/Makefile | 2 ++ projects/daq3/zcu102/system_bd.tcl | 7 +++++++ projects/fmcadc2/vc707/Makefile | 2 ++ projects/fmcadc2/vc707/system_bd.tcl | 6 ++++++ projects/fmcadc2/zc706/Makefile | 2 ++ projects/fmcadc2/zc706/system_bd.tcl | 6 ++++++ projects/fmcadc5/vc707/Makefile | 2 ++ projects/fmcadc5/vc707/system_bd.tcl | 7 +++++++ projects/fmcjesdadc1/kc705/Makefile | 2 ++ projects/fmcjesdadc1/kc705/system_bd.tcl | 7 +++++++ projects/fmcjesdadc1/vc707/Makefile | 2 ++ projects/fmcjesdadc1/vc707/system_bd.tcl | 7 +++++++ projects/fmcjesdadc1/zc706/Makefile | 2 ++ projects/fmcjesdadc1/zc706/system_bd.tcl | 7 ++++++- projects/fmcomms11/zc706/Makefile | 2 ++ projects/fmcomms11/zc706/system_bd.tcl | 6 ++++++ projects/fmcomms2/kc705/Makefile | 2 ++ projects/fmcomms2/kc705/system_bd.tcl | 7 +++++++ projects/fmcomms2/kcu105/Makefile | 2 ++ projects/fmcomms2/kcu105/system_bd.tcl | 7 +++++++ projects/fmcomms2/vc707/Makefile | 2 ++ projects/fmcomms2/vc707/system_bd.tcl | 7 +++++++ projects/fmcomms2/zc702/Makefile | 2 ++ projects/fmcomms2/zc702/system_bd.tcl | 7 +++++++ projects/fmcomms2/zc706/Makefile | 2 ++ projects/fmcomms2/zc706/system_bd.tcl | 7 +++++++ projects/fmcomms2/zcu102/Makefile | 2 ++ projects/fmcomms2/zcu102/system_bd.tcl | 7 +++++++ projects/fmcomms2/zed/Makefile | 2 ++ projects/fmcomms2/zed/system_bd.tcl | 7 +++++++ projects/fmcomms5/zc702/Makefile | 2 ++ projects/fmcomms5/zc702/system_bd.tcl | 7 +++++++ projects/fmcomms5/zc706/Makefile | 2 ++ projects/fmcomms5/zc706/system_bd.tcl | 7 +++++++ projects/fmcomms5/zcu102/Makefile | 2 ++ projects/fmcomms5/zcu102/system_bd.tcl | 8 +++++++- projects/imageon/zed/Makefile | 2 ++ projects/imageon/zed/system_bd.tcl | 6 ++++++ 121 files changed, 590 insertions(+), 8 deletions(-) diff --git a/library/Makefile b/library/Makefile index 2c9462195..738af4923 100644 --- a/library/Makefile +++ b/library/Makefile @@ -53,6 +53,7 @@ clean: $(MAKE) -C axi_rd_wr_combiner clean $(MAKE) -C axi_spdif_rx clean $(MAKE) -C axi_spdif_tx clean + $(MAKE) -C axi_sysid clean $(MAKE) -C axi_usb_fx3 clean $(MAKE) -C cn0363/cn0363_dma_sequencer clean $(MAKE) -C cn0363/cn0363_phase_data_sync clean @@ -84,6 +85,7 @@ clean: $(MAKE) -C spi_engine/spi_engine_execution clean $(MAKE) -C spi_engine/spi_engine_interconnect clean $(MAKE) -C spi_engine/spi_engine_offload clean + $(MAKE) -C sysid_rom clean $(MAKE) -C util_adcfifo clean $(MAKE) -C util_axis_fifo clean $(MAKE) -C util_axis_resize clean @@ -163,6 +165,7 @@ lib: $(MAKE) -C axi_rd_wr_combiner $(MAKE) -C axi_spdif_rx $(MAKE) -C axi_spdif_tx + $(MAKE) -C axi_sysid $(MAKE) -C axi_usb_fx3 $(MAKE) -C cn0363/cn0363_dma_sequencer $(MAKE) -C cn0363/cn0363_phase_data_sync @@ -194,6 +197,7 @@ lib: $(MAKE) -C spi_engine/spi_engine_execution $(MAKE) -C spi_engine/spi_engine_interconnect $(MAKE) -C spi_engine/spi_engine_offload + $(MAKE) -C sysid_rom $(MAKE) -C util_adcfifo $(MAKE) -C util_axis_fifo $(MAKE) -C util_axis_resize diff --git a/projects/ad40xx_fmc/zed/Makefile b/projects/ad40xx_fmc/zed/Makefile index d4fdbeed7..dca1f1c6d 100644 --- a/projects/ad40xx_fmc/zed/Makefile +++ b/projects/ad40xx_fmc/zed/Makefile @@ -15,6 +15,8 @@ LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_i2s_adi LIB_DEPS += axi_spdif_tx +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom LIB_DEPS += spi_engine/axi_spi_engine LIB_DEPS += spi_engine/spi_engine_execution LIB_DEPS += spi_engine/spi_engine_interconnect diff --git a/projects/ad40xx_fmc/zed/system_bd.tcl b/projects/ad40xx_fmc/zed/system_bd.tcl index 1a88dd494..4265b538a 100644 --- a/projects/ad40xx_fmc/zed/system_bd.tcl +++ b/projects/ad40xx_fmc/zed/system_bd.tcl @@ -15,3 +15,10 @@ set adc_sampling_rate 1800000 source ../common/ad40xx_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + diff --git a/projects/ad5758_sdz/zed/Makefile b/projects/ad5758_sdz/zed/Makefile index ea7bb8cef..60a2ba402 100644 --- a/projects/ad5758_sdz/zed/Makefile +++ b/projects/ad5758_sdz/zed/Makefile @@ -14,6 +14,8 @@ LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_i2s_adi LIB_DEPS += axi_spdif_tx +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom LIB_DEPS += util_i2c_mixer include ../../scripts/project-xilinx.mk diff --git a/projects/ad5758_sdz/zed/system_bd.tcl b/projects/ad5758_sdz/zed/system_bd.tcl index 253f4f30e..68163bd5d 100644 --- a/projects/ad5758_sdz/zed/system_bd.tcl +++ b/projects/ad5758_sdz/zed/system_bd.tcl @@ -1,3 +1,10 @@ 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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + diff --git a/projects/ad5766_sdz/zed/Makefile b/projects/ad5766_sdz/zed/Makefile index 42b5d8ada..0a812bb4b 100644 --- a/projects/ad5766_sdz/zed/Makefile +++ b/projects/ad5766_sdz/zed/Makefile @@ -16,6 +16,8 @@ LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_i2s_adi LIB_DEPS += axi_spdif_tx +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom LIB_DEPS += spi_engine/axi_spi_engine LIB_DEPS += spi_engine/spi_engine_execution LIB_DEPS += spi_engine/spi_engine_interconnect diff --git a/projects/ad5766_sdz/zed/system_bd.tcl b/projects/ad5766_sdz/zed/system_bd.tcl index 97ddf046f..33d65165a 100644 --- a/projects/ad5766_sdz/zed/system_bd.tcl +++ b/projects/ad5766_sdz/zed/system_bd.tcl @@ -1,4 +1,12 @@ 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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + source ../common/ad5766_bd.tcl diff --git a/projects/ad6676evb/vc707/Makefile b/projects/ad6676evb/vc707/Makefile index 688289f18..ae48c0b97 100644 --- a/projects/ad6676evb/vc707/Makefile +++ b/projects/ad6676evb/vc707/Makefile @@ -20,5 +20,7 @@ LIB_DEPS += jesd204/jesd204_rx LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/ad6676evb/vc707/system_bd.tcl b/projects/ad6676evb/vc707/system_bd.tcl index f70d37f2b..66b9a6cae 100644 --- a/projects/ad6676evb/vc707/system_bd.tcl +++ b/projects/ad6676evb/vc707/system_bd.tcl @@ -2,4 +2,9 @@ source $ad_hdl_dir/projects/common/vc707/vc707_system_bd.tcl source ../common/ad6676evb_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad6676evb/zc706/Makefile b/projects/ad6676evb/zc706/Makefile index e24b29f57..90dfb32ec 100644 --- a/projects/ad6676evb/zc706/Makefile +++ b/projects/ad6676evb/zc706/Makefile @@ -22,5 +22,7 @@ LIB_DEPS += jesd204/jesd204_rx LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/ad6676evb/zc706/system_bd.tcl b/projects/ad6676evb/zc706/system_bd.tcl index 9052b9c38..1ed5440dd 100644 --- a/projects/ad6676evb/zc706/system_bd.tcl +++ b/projects/ad6676evb/zc706/system_bd.tcl @@ -2,4 +2,9 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source ../common/ad6676evb_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad7134_fmc/zed/Makefile b/projects/ad7134_fmc/zed/Makefile index d5c5bb39c..3b58af03d 100644 --- a/projects/ad7134_fmc/zed/Makefile +++ b/projects/ad7134_fmc/zed/Makefile @@ -15,6 +15,8 @@ LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_i2s_adi LIB_DEPS += axi_spdif_tx +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom LIB_DEPS += spi_engine/axi_spi_engine LIB_DEPS += spi_engine/spi_engine_execution LIB_DEPS += spi_engine/spi_engine_interconnect diff --git a/projects/ad7134_fmc/zed/system_bd.tcl b/projects/ad7134_fmc/zed/system_bd.tcl index c42f7b151..d3405d547 100644 --- a/projects/ad7134_fmc/zed/system_bd.tcl +++ b/projects/ad7134_fmc/zed/system_bd.tcl @@ -1,6 +1,13 @@ 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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + # specify ADC resolution -- the design supports 16/24/32 bit resolutions set adc_resolution 24 @@ -10,4 +17,3 @@ set adc_resolution 24 set adc_num_of_channels 8 source ../common/ad7134_bd.tcl - diff --git a/projects/ad738x_fmc/zed/Makefile b/projects/ad738x_fmc/zed/Makefile index 01e50db9e..6ceed7439 100644 --- a/projects/ad738x_fmc/zed/Makefile +++ b/projects/ad738x_fmc/zed/Makefile @@ -15,6 +15,8 @@ LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_i2s_adi LIB_DEPS += axi_spdif_tx +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom LIB_DEPS += spi_engine/axi_spi_engine LIB_DEPS += spi_engine/spi_engine_execution LIB_DEPS += spi_engine/spi_engine_interconnect diff --git a/projects/ad738x_fmc/zed/system_bd.tcl b/projects/ad738x_fmc/zed/system_bd.tcl index 24fceaf79..e99533a49 100644 --- a/projects/ad738x_fmc/zed/system_bd.tcl +++ b/projects/ad738x_fmc/zed/system_bd.tcl @@ -1,6 +1,13 @@ 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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + # specify ADC resolution -- the design supports 16/14/12 bit resolutions set adc_resolution 16 diff --git a/projects/ad7405_fmc/zed/Makefile b/projects/ad7405_fmc/zed/Makefile index bc6540c29..50e22fa2a 100644 --- a/projects/ad7405_fmc/zed/Makefile +++ b/projects/ad7405_fmc/zed/Makefile @@ -17,6 +17,8 @@ LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_i2s_adi LIB_DEPS += axi_spdif_tx +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom LIB_DEPS += util_dec256sinc24b LIB_DEPS += util_i2c_mixer diff --git a/projects/ad7405_fmc/zed/system_bd.tcl b/projects/ad7405_fmc/zed/system_bd.tcl index c1559bd85..913a33b07 100644 --- a/projects/ad7405_fmc/zed/system_bd.tcl +++ b/projects/ad7405_fmc/zed/system_bd.tcl @@ -1,6 +1,13 @@ 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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + # System clock is 100 MHz for this base design set sys_cpu_clk_freq 100 diff --git a/projects/ad7616_sdz/zc706/Makefile b/projects/ad7616_sdz/zc706/Makefile index 6d7d4574c..9888d1f70 100644 --- a/projects/ad7616_sdz/zc706/Makefile +++ b/projects/ad7616_sdz/zc706/Makefile @@ -17,5 +17,7 @@ LIB_DEPS += axi_clkgen LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_spdif_tx +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/ad7616_sdz/zc706/system_bd.tcl b/projects/ad7616_sdz/zc706/system_bd.tcl index 74f34ef33..d6c02ebeb 100644 --- a/projects/ad7616_sdz/zc706/system_bd.tcl +++ b/projects/ad7616_sdz/zc706/system_bd.tcl @@ -1,4 +1,12 @@ 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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + source ../common/ad7616_bd.tcl diff --git a/projects/ad7616_sdz/zed/Makefile b/projects/ad7616_sdz/zed/Makefile index 562424805..1cfe07e84 100644 --- a/projects/ad7616_sdz/zed/Makefile +++ b/projects/ad7616_sdz/zed/Makefile @@ -18,6 +18,8 @@ LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_i2s_adi LIB_DEPS += axi_spdif_tx +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom LIB_DEPS += util_i2c_mixer include ../../scripts/project-xilinx.mk diff --git a/projects/ad7616_sdz/zed/system_bd.tcl b/projects/ad7616_sdz/zed/system_bd.tcl index cf4941e23..2dcf5c4ca 100644 --- a/projects/ad7616_sdz/zed/system_bd.tcl +++ b/projects/ad7616_sdz/zed/system_bd.tcl @@ -1,4 +1,12 @@ 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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + source ../common/ad7616_bd.tcl diff --git a/projects/ad77681evb/zed/Makefile b/projects/ad77681evb/zed/Makefile index d5b3a1021..ec1c966e1 100644 --- a/projects/ad77681evb/zed/Makefile +++ b/projects/ad77681evb/zed/Makefile @@ -16,6 +16,8 @@ LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_i2s_adi LIB_DEPS += axi_spdif_tx +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom LIB_DEPS += spi_engine/axi_spi_engine LIB_DEPS += spi_engine/spi_engine_execution LIB_DEPS += spi_engine/spi_engine_interconnect diff --git a/projects/ad77681evb/zed/system_bd.tcl b/projects/ad77681evb/zed/system_bd.tcl index 08021c9cd..a64eca101 100644 --- a/projects/ad77681evb/zed/system_bd.tcl +++ b/projects/ad77681evb/zed/system_bd.tcl @@ -1,4 +1,12 @@ 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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + source ../common/ad77681evb_bd.tcl diff --git a/projects/ad7768evb/zed/Makefile b/projects/ad7768evb/zed/Makefile index bff38949a..928ae146f 100644 --- a/projects/ad7768evb/zed/Makefile +++ b/projects/ad7768evb/zed/Makefile @@ -16,6 +16,8 @@ LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_i2s_adi LIB_DEPS += axi_spdif_tx +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom LIB_DEPS += util_i2c_mixer include ../../scripts/project-xilinx.mk diff --git a/projects/ad7768evb/zed/system_bd.tcl b/projects/ad7768evb/zed/system_bd.tcl index ec644da27..c3ad21bc5 100644 --- a/projects/ad7768evb/zed/system_bd.tcl +++ b/projects/ad7768evb/zed/system_bd.tcl @@ -1,4 +1,12 @@ 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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + source ../common/ad7768evb_bd.tcl diff --git a/projects/ad9208_dual_ebz/vcu118/Makefile b/projects/ad9208_dual_ebz/vcu118/Makefile index 3019e44ed..82a356dfa 100644 --- a/projects/ad9208_dual_ebz/vcu118/Makefile +++ b/projects/ad9208_dual_ebz/vcu118/Makefile @@ -21,5 +21,7 @@ LIB_DEPS += util_adcfifo LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/ad9208_dual_ebz/vcu118/system_bd.tcl b/projects/ad9208_dual_ebz/vcu118/system_bd.tcl index d88b98aca..f4e85bc5d 100644 --- a/projects/ad9208_dual_ebz/vcu118/system_bd.tcl +++ b/projects/ad9208_dual_ebz/vcu118/system_bd.tcl @@ -6,6 +6,13 @@ source $ad_hdl_dir/projects/common/vcu118/vcu118_system_bd.tcl source $ad_hdl_dir/projects/common/xilinx/adcfifo_bd.tcl source ../common/dual_ad9208_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + foreach i {0 1} { ad_ip_parameter util_adc_${i}_xcvr CONFIG.RX_CLK25_DIV 30 diff --git a/projects/ad9265_fmc/zc706/Makefile b/projects/ad9265_fmc/zc706/Makefile index 5da3bee6e..77d53a6c8 100644 --- a/projects/ad9265_fmc/zc706/Makefile +++ b/projects/ad9265_fmc/zc706/Makefile @@ -16,5 +16,7 @@ LIB_DEPS += axi_clkgen LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_spdif_tx +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/ad9265_fmc/zc706/system_bd.tcl b/projects/ad9265_fmc/zc706/system_bd.tcl index 60c371d1e..127f6cdda 100644 --- a/projects/ad9265_fmc/zc706/system_bd.tcl +++ b/projects/ad9265_fmc/zc706/system_bd.tcl @@ -1,3 +1,10 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source ../common/ad9265_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad9434_fmc/zc706/Makefile b/projects/ad9434_fmc/zc706/Makefile index e0a3c5616..f978d1389 100644 --- a/projects/ad9434_fmc/zc706/Makefile +++ b/projects/ad9434_fmc/zc706/Makefile @@ -16,5 +16,7 @@ LIB_DEPS += axi_clkgen LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_spdif_tx +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/ad9434_fmc/zc706/system_bd.tcl b/projects/ad9434_fmc/zc706/system_bd.tcl index a09718d62..543f4eb5d 100644 --- a/projects/ad9434_fmc/zc706/system_bd.tcl +++ b/projects/ad9434_fmc/zc706/system_bd.tcl @@ -2,3 +2,9 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source ../common/ad9434_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad9467_fmc/kc705/Makefile b/projects/ad9467_fmc/kc705/Makefile index e4284e748..748bb1e1e 100644 --- a/projects/ad9467_fmc/kc705/Makefile +++ b/projects/ad9467_fmc/kc705/Makefile @@ -14,5 +14,7 @@ M_DEPS += ../../../library/xilinx/common/ad_iobuf.v LIB_DEPS += axi_ad9467 LIB_DEPS += axi_dmac +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/ad9467_fmc/kc705/system_bd.tcl b/projects/ad9467_fmc/kc705/system_bd.tcl index aa4089212..1b4962d55 100644 --- a/projects/ad9467_fmc/kc705/system_bd.tcl +++ b/projects/ad9467_fmc/kc705/system_bd.tcl @@ -1,3 +1,10 @@ source $ad_hdl_dir/projects/common/kc705/kc705_system_bd.tcl source ../common/ad9467_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad9467_fmc/zed/Makefile b/projects/ad9467_fmc/zed/Makefile index dfe6151de..3c9959ab1 100644 --- a/projects/ad9467_fmc/zed/Makefile +++ b/projects/ad9467_fmc/zed/Makefile @@ -18,5 +18,7 @@ LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_i2s_adi LIB_DEPS += axi_spdif_tx LIB_DEPS += util_i2c_mixer +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/ad9467_fmc/zed/system_bd.tcl b/projects/ad9467_fmc/zed/system_bd.tcl index a96cd763d..17de54181 100644 --- a/projects/ad9467_fmc/zed/system_bd.tcl +++ b/projects/ad9467_fmc/zed/system_bd.tcl @@ -1,3 +1,10 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source ../common/ad9467_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/ad9739a_fmc/zc706/Makefile b/projects/ad9739a_fmc/zc706/Makefile index 5c7551c26..058ac1f55 100644 --- a/projects/ad9739a_fmc/zc706/Makefile +++ b/projects/ad9739a_fmc/zc706/Makefile @@ -15,5 +15,7 @@ LIB_DEPS += axi_clkgen LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_spdif_tx +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/ad9739a_fmc/zc706/system_bd.tcl b/projects/ad9739a_fmc/zc706/system_bd.tcl index 28df7cc39..3f0bd3947 100644 --- a/projects/ad9739a_fmc/zc706/system_bd.tcl +++ b/projects/ad9739a_fmc/zc706/system_bd.tcl @@ -2,3 +2,9 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source ../common/ad9739a_fmc_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/adaq7980_sdz/zed/Makefile b/projects/adaq7980_sdz/zed/Makefile index fed6ab00f..a1d30f615 100644 --- a/projects/adaq7980_sdz/zed/Makefile +++ b/projects/adaq7980_sdz/zed/Makefile @@ -15,6 +15,8 @@ LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_i2s_adi LIB_DEPS += axi_spdif_tx +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom LIB_DEPS += spi_engine/axi_spi_engine LIB_DEPS += spi_engine/spi_engine_execution LIB_DEPS += spi_engine/spi_engine_interconnect diff --git a/projects/adaq7980_sdz/zed/system_bd.tcl b/projects/adaq7980_sdz/zed/system_bd.tcl index ceaa440ca..89d7d18b2 100644 --- a/projects/adaq7980_sdz/zed/system_bd.tcl +++ b/projects/adaq7980_sdz/zed/system_bd.tcl @@ -1,6 +1,13 @@ 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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + # specify ADC sampling rate in samples/seconds -- default is 1 MSPS set adc_sampling_rate 1000000 diff --git a/projects/adrv9009/zc706/Makefile b/projects/adrv9009/zc706/Makefile index 49c585f6a..e3c1a6ab7 100644 --- a/projects/adrv9009/zc706/Makefile +++ b/projects/adrv9009/zc706/Makefile @@ -28,5 +28,7 @@ LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/axi_dacfifo LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/adrv9009/zc706/system_bd.tcl b/projects/adrv9009/zc706/system_bd.tcl index 22f658bd5..aa589e5da 100644 --- a/projects/adrv9009/zc706/system_bd.tcl +++ b/projects/adrv9009/zc706/system_bd.tcl @@ -4,6 +4,13 @@ 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 +#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 "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + ad_ip_parameter sys_ps7 CONFIG.PCW_FPGA2_PERIPHERAL_FREQMHZ 250 source ../common/adrv9009_bd.tcl diff --git a/projects/adrv9009/zcu102/Makefile b/projects/adrv9009/zcu102/Makefile index 081483a8d..12c413fa1 100644 --- a/projects/adrv9009/zcu102/Makefile +++ b/projects/adrv9009/zcu102/Makefile @@ -25,5 +25,7 @@ LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/adrv9009/zcu102/system_bd.tcl b/projects/adrv9009/zcu102/system_bd.tcl index 2273a9a0e..8dd523091 100644 --- a/projects/adrv9009/zcu102/system_bd.tcl +++ b/projects/adrv9009/zcu102/system_bd.tcl @@ -7,6 +7,13 @@ set dac_fifo_address_width 17 source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source $ad_hdl_dir/projects/common/xilinx/dacfifo_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + ad_mem_hp0_interconnect sys_cpu_clk sys_ps8/S_AXI_HP0 source ../common/adrv9009_bd.tcl diff --git a/projects/adrv9371x/kcu105/Makefile b/projects/adrv9371x/kcu105/Makefile index b3f37ba94..ae46cd994 100644 --- a/projects/adrv9371x/kcu105/Makefile +++ b/projects/adrv9371x/kcu105/Makefile @@ -27,5 +27,7 @@ LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/adrv9371x/kcu105/system_bd.tcl b/projects/adrv9371x/kcu105/system_bd.tcl index c0cac799a..e13c5282a 100644 --- a/projects/adrv9371x/kcu105/system_bd.tcl +++ b/projects/adrv9371x/kcu105/system_bd.tcl @@ -8,6 +8,15 @@ source $ad_hdl_dir/projects/common/kcu105/kcu105_system_bd.tcl source $ad_hdl_dir/projects/common/kcu105/kcu105_system_mig.tcl source $ad_hdl_dir/projects/common/xilinx/dacfifo_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + +ad_ip_parameter axi_ddr_cntrl CONFIG.ADDN_UI_CLKOUT3_FREQ_HZ 200 + source ../common/adrv9371x_bd.tcl ad_ip_parameter util_ad9371_xcvr CONFIG.QPLL_FBDIV 80 diff --git a/projects/adrv9371x/zc706/Makefile b/projects/adrv9371x/zc706/Makefile index dce441e47..8ec3f7017 100644 --- a/projects/adrv9371x/zc706/Makefile +++ b/projects/adrv9371x/zc706/Makefile @@ -28,5 +28,7 @@ LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/axi_dacfifo LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/adrv9371x/zc706/system_bd.tcl b/projects/adrv9371x/zc706/system_bd.tcl index 1e27b3fa5..f78410887 100644 --- a/projects/adrv9371x/zc706/system_bd.tcl +++ b/projects/adrv9371x/zc706/system_bd.tcl @@ -4,5 +4,14 @@ 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 +#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 "sys rom custom string placeholder" +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/Makefile b/projects/adrv9371x/zcu102/Makefile index 2cab62bcf..e5717d790 100644 --- a/projects/adrv9371x/zcu102/Makefile +++ b/projects/adrv9371x/zcu102/Makefile @@ -25,5 +25,7 @@ LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/adrv9371x/zcu102/system_bd.tcl b/projects/adrv9371x/zcu102/system_bd.tcl index fcb14fbca..68626def3 100644 --- a/projects/adrv9371x/zcu102/system_bd.tcl +++ b/projects/adrv9371x/zcu102/system_bd.tcl @@ -7,10 +7,20 @@ set dac_fifo_address_width 17 source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source $ad_hdl_dir/projects/common/xilinx/dacfifo_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +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} +ad_ip_parameter sys_ps8 CONFIG.PSU__CRL_APB__PL2_REF_CTRL__FREQMHZ 200 + source ../common/adrv9371x_bd.tcl ad_ip_parameter axi_ad9371_tx_xcvr CONFIG.TX_DIFFCTRL 6 ad_ip_parameter util_ad9371_xcvr CONFIG.QPLL_FBDIV 80 ad_ip_parameter util_ad9371_xcvr CONFIG.QPLL_REFCLK_DIV 1 - diff --git a/projects/adv7511/zc702/Makefile b/projects/adv7511/zc702/Makefile index 3a9c25302..03ea4a35f 100644 --- a/projects/adv7511/zc702/Makefile +++ b/projects/adv7511/zc702/Makefile @@ -13,5 +13,7 @@ LIB_DEPS += axi_clkgen LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_spdif_tx +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/adv7511/zc702/system_bd.tcl b/projects/adv7511/zc702/system_bd.tcl index ef072346b..d46a81aa7 100644 --- a/projects/adv7511/zc702/system_bd.tcl +++ b/projects/adv7511/zc702/system_bd.tcl @@ -1,3 +1,9 @@ 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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/adv7511/zc706/Makefile b/projects/adv7511/zc706/Makefile index 4f1eab348..fd23cbf75 100644 --- a/projects/adv7511/zc706/Makefile +++ b/projects/adv7511/zc706/Makefile @@ -13,5 +13,7 @@ LIB_DEPS += axi_clkgen LIB_DEPS += axi_dmac LIB_DEPS += axi_hdmi_tx LIB_DEPS += axi_spdif_tx +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/adv7511/zc706/system_bd.tcl b/projects/adv7511/zc706/system_bd.tcl index 523479a01..d0af7cd2f 100644 --- a/projects/adv7511/zc706/system_bd.tcl +++ b/projects/adv7511/zc706/system_bd.tcl @@ -1,3 +1,9 @@ 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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/cn0363/zed/Makefile b/projects/cn0363/zed/Makefile index 51dceb01f..9598b906d 100644 --- a/projects/cn0363/zed/Makefile +++ b/projects/cn0363/zed/Makefile @@ -26,5 +26,7 @@ LIB_DEPS += spi_engine/spi_engine_offload LIB_DEPS += util_axis_resize LIB_DEPS += util_i2c_mixer LIB_DEPS += util_sigma_delta_spi +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/cn0363/zed/system_bd.tcl b/projects/cn0363/zed/system_bd.tcl index 09be8020d..5b8aeda4a 100644 --- a/projects/cn0363/zed/system_bd.tcl +++ b/projects/cn0363/zed/system_bd.tcl @@ -2,6 +2,13 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source ../common/cn0363_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + ad_ip_parameter sys_ps7 CONFIG.PCW_GPIO_EMIO_GPIO_IO 35 set_property LEFT 34 [get_bd_ports GPIO_I] diff --git a/projects/common/ac701/ac701_system_bd.tcl b/projects/common/ac701/ac701_system_bd.tcl index 163a81f4c..271bddc45 100644 --- a/projects/common/ac701/ac701_system_bd.tcl +++ b/projects/common/ac701/ac701_system_bd.tcl @@ -111,6 +111,15 @@ ad_ip_parameter axi_gpio CONFIG.C_GPIO_WIDTH 32 ad_ip_parameter axi_gpio CONFIG.C_GPIO2_WIDTH 32 ad_ip_parameter axi_gpio CONFIG.C_INTERRUPT_PRESENT 1 +# system id + +ad_ip_instance axi_sysid axi_sysid_0 +ad_ip_instance sysid_rom rom_sys_0 + +ad_connect axi_sysid_0/rom_addr rom_sys_0/rom_addr +ad_connect axi_sysid_0/sys_rom_data rom_sys_0/rom_data +ad_connect sys_cpu_clk rom_sys_0/clk + # instance: interrupt ad_ip_instance axi_intc axi_intc @@ -254,6 +263,7 @@ ad_cpu_interconnect 0x41200000 axi_intc ad_cpu_interconnect 0x41C00000 axi_timer ad_cpu_interconnect 0x40600000 axi_uart ad_cpu_interconnect 0x41600000 axi_iic_main +ad_cpu_interconnect 0x45000000 axi_sysid_0 ad_cpu_interconnect 0x40000000 axi_gpio ad_cpu_interconnect 0x44A70000 axi_spi diff --git a/projects/common/kc705/kc705_system_bd.tcl b/projects/common/kc705/kc705_system_bd.tcl index 18f68e59d..9387c1e61 100644 --- a/projects/common/kc705/kc705_system_bd.tcl +++ b/projects/common/kc705/kc705_system_bd.tcl @@ -134,6 +134,15 @@ ad_ip_parameter axi_linear_flash CONFIG.C_TCEDV_PS_MEM_0 100000 ad_ip_parameter axi_linear_flash CONFIG.C_TAVDV_PS_MEM_0 100000 ad_ip_parameter axi_linear_flash CONFIG.C_THZOE_PS_MEM_0 15000 +# system id + +ad_ip_instance axi_sysid axi_sysid_0 +ad_ip_instance sysid_rom rom_sys_0 + +ad_connect axi_sysid_0/rom_addr rom_sys_0/rom_addr +ad_connect axi_sysid_0/sys_rom_data rom_sys_0/rom_data +ad_connect sys_cpu_clk rom_sys_0/clk + # connections ad_connect sys_mb_debug/Debug_SYS_Rst sys_rstgen/mb_debug_sys_rst @@ -259,6 +268,7 @@ ad_cpu_interconnect 0x41200000 axi_intc ad_cpu_interconnect 0x41C00000 axi_timer ad_cpu_interconnect 0x40600000 axi_uart ad_cpu_interconnect 0x41600000 axi_iic_main +ad_cpu_interconnect 0x45000000 axi_sysid_0 ad_cpu_interconnect 0x40000000 axi_gpio ad_cpu_interconnect 0x44A70000 axi_spi ad_cpu_interconnect 0x60000000 axi_linear_flash diff --git a/projects/common/kcu105/kcu105_system_bd.tcl b/projects/common/kcu105/kcu105_system_bd.tcl index 284e3bbab..1e99f70e8 100644 --- a/projects/common/kcu105/kcu105_system_bd.tcl +++ b/projects/common/kcu105/kcu105_system_bd.tcl @@ -218,6 +218,15 @@ ad_connect gpio1_o axi_gpio/gpio2_io_o ad_connect gpio1_t axi_gpio/gpio2_io_t ad_connect sys_cpu_clk axi_spi/ext_spi_clk +# system id + +ad_ip_instance axi_sysid axi_sysid_0 +ad_ip_instance sysid_rom rom_sys_0 + +ad_connect axi_sysid_0/rom_addr rom_sys_0/rom_addr +ad_connect axi_sysid_0/sys_rom_data rom_sys_0/rom_data +ad_connect sys_cpu_clk rom_sys_0/clk + # interrupts ad_connect sys_concat_intc/In0 axi_timer/interrupt @@ -246,6 +255,7 @@ ad_cpu_interconnect 0x40600000 axi_uart ad_cpu_interconnect 0x41C00000 axi_timer ad_cpu_interconnect 0x41200000 axi_intc ad_cpu_interconnect 0x41600000 axi_iic_main +ad_cpu_interconnect 0x45000000 axi_sysid_0 ad_cpu_interconnect 0x40000000 axi_gpio ad_cpu_interconnect 0x44A70000 axi_spi diff --git a/projects/common/microzed/microzed_system_bd.tcl b/projects/common/microzed/microzed_system_bd.tcl index 25b5dbc51..eb62b2367 100644 --- a/projects/common/microzed/microzed_system_bd.tcl +++ b/projects/common/microzed/microzed_system_bd.tcl @@ -110,6 +110,16 @@ ad_connect spi1_sdo_i sys_ps7/SPI1_MOSI_I ad_connect spi1_sdo_o sys_ps7/SPI1_MOSI_O ad_connect spi1_sdi_i sys_ps7/SPI1_MISO_I +# system id + +ad_ip_instance axi_sysid axi_sysid_0 +ad_ip_instance sysid_rom rom_sys_0 + +ad_connect axi_sysid_0/rom_addr rom_sys_0/rom_addr +ad_connect axi_sysid_0/sys_rom_data rom_sys_0/rom_data +ad_connect sys_cpu_clk rom_sys_0/clk + +ad_cpu_interconnect 0x45000000 axi_sysid_0 # interrupts ad_connect sys_concat_intc/dout sys_ps7/IRQ_F2P diff --git a/projects/common/vc707/vc707_system_bd.tcl b/projects/common/vc707/vc707_system_bd.tcl index 7c653a3ba..38ec6dc97 100644 --- a/projects/common/vc707/vc707_system_bd.tcl +++ b/projects/common/vc707/vc707_system_bd.tcl @@ -157,6 +157,15 @@ ad_connect sys_ilmb_cntlr/BRAM_PORT sys_lmb_bram/BRAM_PORTB ad_connect sys_mb/DLMB sys_dlmb/LMB_M ad_connect sys_mb/ILMB sys_ilmb/LMB_M +# system id + +ad_ip_instance axi_sysid axi_sysid_0 +ad_ip_instance sysid_rom rom_sys_0 + +ad_connect axi_sysid_0/rom_addr rom_sys_0/rom_addr +ad_connect axi_sysid_0/sys_rom_data rom_sys_0/rom_data +ad_connect sys_cpu_clk rom_sys_0/clk + # microblaze debug & interrupt ad_connect sys_mb_debug/MBDEBUG_0 sys_mb/DEBUG @@ -282,6 +291,7 @@ ad_cpu_interconnect 0x41200000 axi_intc ad_cpu_interconnect 0x41C00000 axi_timer ad_cpu_interconnect 0x40600000 axi_uart ad_cpu_interconnect 0x41600000 axi_iic_main +ad_cpu_interconnect 0x45000000 axi_sysid_0 ad_cpu_interconnect 0x40000000 axi_gpio ad_cpu_interconnect 0x44A70000 axi_spi ad_cpu_interconnect 0x60000000 axi_linear_flash diff --git a/projects/common/vcu118/vcu118_system_bd.tcl b/projects/common/vcu118/vcu118_system_bd.tcl index 8f5ef6346..654be967f 100644 --- a/projects/common/vcu118/vcu118_system_bd.tcl +++ b/projects/common/vcu118/vcu118_system_bd.tcl @@ -207,6 +207,15 @@ ad_connect axi_ethernet_0/axi_txc_arstn axi_ethernet_dma/mm2s_cntrl_reset_out_n ad_connect axi_ethernet_0/axi_rxd_arstn axi_ethernet_dma/s2mm_prmry_reset_out_n ad_connect axi_ethernet_0/axi_rxs_arstn axi_ethernet_dma/s2mm_sts_reset_out_n +# system id + +ad_ip_instance axi_sysid axi_sysid_0 +ad_ip_instance sysid_rom rom_sys_0 + +ad_connect axi_sysid_0/rom_addr rom_sys_0/rom_addr +ad_connect axi_sysid_0/sys_rom_data rom_sys_0/rom_data +ad_connect sys_cpu_clk rom_sys_0/clk + # iic, spi and gpio ad_connect iic_main axi_iic_main/iic @@ -255,6 +264,7 @@ ad_cpu_interconnect 0x40600000 axi_uart ad_cpu_interconnect 0x41200000 axi_intc ad_cpu_interconnect 0x41C00000 axi_timer ad_cpu_interconnect 0x41600000 axi_iic_main +ad_cpu_interconnect 0x45000000 axi_sysid_0 ad_cpu_interconnect 0x44A70000 axi_spi ad_cpu_interconnect 0x41400000 sys_mb_debug diff --git a/projects/common/zc702/zc702_system_bd.tcl b/projects/common/zc702/zc702_system_bd.tcl index 7cbc7f8eb..d6202383b 100644 --- a/projects/common/zc702/zc702_system_bd.tcl +++ b/projects/common/zc702/zc702_system_bd.tcl @@ -190,6 +190,15 @@ ad_connect sys_cpu_resetn sys_audio_clkgen/resetn ad_connect sys_audio_clkgen/clk_out1 axi_spdif_tx_core/spdif_data_clk ad_connect spdif axi_spdif_tx_core/spdif_tx_o +# system id + +ad_ip_instance axi_sysid axi_sysid_0 +ad_ip_instance sysid_rom rom_sys_0 + +ad_connect axi_sysid_0/rom_addr rom_sys_0/rom_addr +ad_connect axi_sysid_0/sys_rom_data rom_sys_0/rom_data +ad_connect sys_cpu_clk rom_sys_0/clk + # match up interconnects ad_connect sys_concat_intc/dout sys_ps7/IRQ_F2P @@ -213,6 +222,7 @@ ad_connect sys_concat_intc/In0 GND # address map ad_cpu_interconnect 0x41600000 axi_iic_main +ad_cpu_interconnect 0x45000000 axi_sysid_0 ad_cpu_interconnect 0x79000000 axi_hdmi_clkgen ad_cpu_interconnect 0x43000000 axi_hdmi_dma ad_cpu_interconnect 0x70e00000 axi_hdmi_core diff --git a/projects/common/zc706/zc706_system_bd.tcl b/projects/common/zc706/zc706_system_bd.tcl index 1881a34fa..74246d95c 100644 --- a/projects/common/zc706/zc706_system_bd.tcl +++ b/projects/common/zc706/zc706_system_bd.tcl @@ -191,6 +191,15 @@ ad_connect sys_cpu_resetn sys_audio_clkgen/resetn ad_connect sys_audio_clkgen/clk_out1 axi_spdif_tx_core/spdif_data_clk ad_connect spdif axi_spdif_tx_core/spdif_tx_o +# system id + +ad_ip_instance axi_sysid axi_sysid_0 +ad_ip_instance sysid_rom rom_sys_0 + +ad_connect axi_sysid_0/rom_addr rom_sys_0/rom_addr +ad_connect axi_sysid_0/sys_rom_data rom_sys_0/rom_data +ad_connect sys_cpu_clk rom_sys_0/clk + # interrupts ad_connect sys_concat_intc/dout sys_ps7/IRQ_F2P @@ -214,6 +223,7 @@ ad_connect sys_concat_intc/In0 GND # interconnects ad_cpu_interconnect 0x41600000 axi_iic_main +ad_cpu_interconnect 0x45000000 axi_sysid_0 ad_cpu_interconnect 0x79000000 axi_hdmi_clkgen ad_cpu_interconnect 0x43000000 axi_hdmi_dma ad_cpu_interconnect 0x70e00000 axi_hdmi_core diff --git a/projects/common/zcu102/zcu102_system_bd.tcl b/projects/common/zcu102/zcu102_system_bd.tcl index 84a89ec75..19c2d4f13 100644 --- a/projects/common/zcu102/zcu102_system_bd.tcl +++ b/projects/common/zcu102/zcu102_system_bd.tcl @@ -128,7 +128,17 @@ ad_connect sys_ps8/emio_spi1_ss_i_n VCC ad_connect sys_ps8/emio_spi1_sclk_i GND ad_connect sys_ps8/emio_spi1_s_i GND -# interrupts +# system id + +ad_ip_instance axi_sysid axi_sysid_0 +ad_ip_instance sysid_rom rom_sys_0 + +ad_connect axi_sysid_0/rom_addr rom_sys_0/rom_addr +ad_connect axi_sysid_0/sys_rom_data rom_sys_0/rom_data +ad_connect sys_cpu_clk rom_sys_0/clk + +ad_cpu_interconnect 0x45000000 axi_sysid_0 +# interrupts ad_ip_instance xlconcat sys_concat_intc_0 ad_ip_parameter sys_concat_intc_0 CONFIG.NUM_PORTS 8 diff --git a/projects/common/zed/zed_system_bd.tcl b/projects/common/zed/zed_system_bd.tcl index c00e099d8..a55639b54 100755 --- a/projects/common/zed/zed_system_bd.tcl +++ b/projects/common/zed/zed_system_bd.tcl @@ -264,6 +264,7 @@ ad_ip_instance sysid_rom rom_sys_0 ad_connect axi_sysid_0/rom_addr rom_sys_0/rom_addr ad_connect axi_sysid_0/sys_rom_data rom_sys_0/rom_data +ad_connect sys_cpu_clk rom_sys_0/clk # interrupts diff --git a/projects/dac_fmc_ebz/zc706/Makefile b/projects/dac_fmc_ebz/zc706/Makefile index d68f62802..93f7e6190 100644 --- a/projects/dac_fmc_ebz/zc706/Makefile +++ b/projects/dac_fmc_ebz/zc706/Makefile @@ -24,5 +24,7 @@ LIB_DEPS += util_dacfifo LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/dac_fmc_ebz/zc706/system_bd.tcl b/projects/dac_fmc_ebz/zc706/system_bd.tcl index fc7de0112..3e7dbcba3 100644 --- a/projects/dac_fmc_ebz/zc706/system_bd.tcl +++ b/projects/dac_fmc_ebz/zc706/system_bd.tcl @@ -39,4 +39,11 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl source ../common/dac_fmc_ebz_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +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/Makefile b/projects/dac_fmc_ebz/zcu102/Makefile index 3efc1b169..c9b0cde2d 100644 --- a/projects/dac_fmc_ebz/zcu102/Makefile +++ b/projects/dac_fmc_ebz/zcu102/Makefile @@ -21,5 +21,7 @@ LIB_DEPS += util_dacfifo LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/dac_fmc_ebz/zcu102/system_bd.tcl b/projects/dac_fmc_ebz/zcu102/system_bd.tcl index 683a832de..c878d4f06 100644 --- a/projects/dac_fmc_ebz/zcu102/system_bd.tcl +++ b/projects/dac_fmc_ebz/zcu102/system_bd.tcl @@ -27,3 +27,10 @@ ad_ip_parameter util_dac_jesd204_xcvr CONFIG.QPLL_LPF 0x31D ad_ip_parameter dac_jesd204_link/tx CONFIG.SYSREF_IOB false +#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 "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + diff --git a/projects/daq2/kc705/Makefile b/projects/daq2/kc705/Makefile index 1ab50b33a..fa9ce7bed 100644 --- a/projects/daq2/kc705/Makefile +++ b/projects/daq2/kc705/Makefile @@ -28,5 +28,7 @@ LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/daq2/kc705/system_bd.tcl b/projects/daq2/kc705/system_bd.tcl index 1e5778f4d..d92c78028 100644 --- a/projects/daq2/kc705/system_bd.tcl +++ b/projects/daq2/kc705/system_bd.tcl @@ -12,3 +12,9 @@ source $ad_hdl_dir/projects/common/xilinx/adcfifo_bd.tcl source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl source ../common/daq2_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/daq2/kcu105/Makefile b/projects/daq2/kcu105/Makefile index cc5623ca7..f697bdc88 100644 --- a/projects/daq2/kcu105/Makefile +++ b/projects/daq2/kcu105/Makefile @@ -27,5 +27,7 @@ LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/daq2/kcu105/system_bd.tcl b/projects/daq2/kcu105/system_bd.tcl index 51bbbeb0a..9febd5992 100644 --- a/projects/daq2/kcu105/system_bd.tcl +++ b/projects/daq2/kcu105/system_bd.tcl @@ -12,6 +12,13 @@ source $ad_hdl_dir/projects/common/xilinx/adcfifo_bd.tcl source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl source ../common/daq2_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + ad_ip_parameter util_daq2_xcvr CONFIG.QPLL_FBDIV 20 ad_ip_parameter util_daq2_xcvr CONFIG.QPLL_REFCLK_DIV 1 diff --git a/projects/daq2/zc706/Makefile b/projects/daq2/zc706/Makefile index d89af22d6..dbf4052da 100644 --- a/projects/daq2/zc706/Makefile +++ b/projects/daq2/zc706/Makefile @@ -31,5 +31,7 @@ LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adcfifo LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/daq2/zc706/system_bd.tcl b/projects/daq2/zc706/system_bd.tcl index 864b52dad..a5b3b8896 100644 --- a/projects/daq2/zc706/system_bd.tcl +++ b/projects/daq2/zc706/system_bd.tcl @@ -12,3 +12,9 @@ source $ad_hdl_dir/projects/common/zc706/zc706_plddr3_adcfifo_bd.tcl source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl source ../common/daq2_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/daq2/zcu102/Makefile b/projects/daq2/zcu102/Makefile index 117ce6ad8..26e34827f 100644 --- a/projects/daq2/zcu102/Makefile +++ b/projects/daq2/zcu102/Makefile @@ -27,5 +27,7 @@ LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/daq2/zcu102/system_bd.tcl b/projects/daq2/zcu102/system_bd.tcl index 83d4e0844..b1ceb12b1 100644 --- a/projects/daq2/zcu102/system_bd.tcl +++ b/projects/daq2/zcu102/system_bd.tcl @@ -12,6 +12,13 @@ source $ad_hdl_dir/projects/common/xilinx/adcfifo_bd.tcl source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl source ../common/daq2_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + ad_ip_parameter util_daq2_xcvr CONFIG.QPLL_FBDIV 20 ad_ip_parameter util_daq2_xcvr CONFIG.QPLL_REFCLK_DIV 1 diff --git a/projects/daq3/kcu105/Makefile b/projects/daq3/kcu105/Makefile index 0f3994c24..da368afae 100644 --- a/projects/daq3/kcu105/Makefile +++ b/projects/daq3/kcu105/Makefile @@ -27,5 +27,7 @@ LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/daq3/kcu105/system_bd.tcl b/projects/daq3/kcu105/system_bd.tcl index 223e8d680..8c7873a4b 100644 --- a/projects/daq3/kcu105/system_bd.tcl +++ b/projects/daq3/kcu105/system_bd.tcl @@ -12,6 +12,13 @@ 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 +#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 "sys rom custom string placeholder" +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/Makefile b/projects/daq3/vcu118/Makefile index 1128dbfec..7a47727b0 100644 --- a/projects/daq3/vcu118/Makefile +++ b/projects/daq3/vcu118/Makefile @@ -27,5 +27,7 @@ LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/daq3/vcu118/system_bd.tcl b/projects/daq3/vcu118/system_bd.tcl index da126c870..d54ce163f 100644 --- a/projects/daq3/vcu118/system_bd.tcl +++ b/projects/daq3/vcu118/system_bd.tcl @@ -11,6 +11,13 @@ 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 +#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 "sys rom custom string placeholder" +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 ad_ip_parameter util_daq3_xcvr CONFIG.QPLL_CFG0 0x331C @@ -31,4 +38,3 @@ ad_ip_parameter axi_ad9680_dma CONFIG.AXI_SLICE_DEST true ad_ip_parameter axi_ad9680_dma CONFIG.AXI_SLICE_SRC true ad_ip_parameter axi_ad9152_dma CONFIG.AXI_SLICE_DEST true ad_ip_parameter axi_ad9152_dma CONFIG.AXI_SLICE_SRC true - diff --git a/projects/daq3/zc706/Makefile b/projects/daq3/zc706/Makefile index cbdeaaba6..0abceee0f 100644 --- a/projects/daq3/zc706/Makefile +++ b/projects/daq3/zc706/Makefile @@ -31,5 +31,7 @@ LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adcfifo LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/daq3/zc706/system_bd.tcl b/projects/daq3/zc706/system_bd.tcl index 290294052..0d0e1a1c2 100644 --- a/projects/daq3/zc706/system_bd.tcl +++ b/projects/daq3/zc706/system_bd.tcl @@ -12,3 +12,9 @@ source $ad_hdl_dir/projects/common/zc706/zc706_plddr3_adcfifo_bd.tcl source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl source ../common/daq3_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/daq3/zcu102/Makefile b/projects/daq3/zcu102/Makefile index f1306bd8a..a14a7ee94 100644 --- a/projects/daq3/zcu102/Makefile +++ b/projects/daq3/zcu102/Makefile @@ -25,5 +25,7 @@ LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/daq3/zcu102/system_bd.tcl b/projects/daq3/zcu102/system_bd.tcl index 07e3f2d34..b151a22ed 100644 --- a/projects/daq3/zcu102/system_bd.tcl +++ b/projects/daq3/zcu102/system_bd.tcl @@ -8,6 +8,13 @@ source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source $ad_hdl_dir/projects/common/xilinx/dacfifo_bd.tcl source ../common/daq3_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +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 ad_ip_parameter util_daq3_xcvr CONFIG.CPLL_CFG1 0x0021 diff --git a/projects/fmcadc2/vc707/Makefile b/projects/fmcadc2/vc707/Makefile index 8dc6402f8..709fd19e5 100644 --- a/projects/fmcadc2/vc707/Makefile +++ b/projects/fmcadc2/vc707/Makefile @@ -22,5 +22,7 @@ LIB_DEPS += jesd204/jesd204_rx LIB_DEPS += util_adcfifo LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/fmcadc2/vc707/system_bd.tcl b/projects/fmcadc2/vc707/system_bd.tcl index d4340c4ff..cc44819ac 100644 --- a/projects/fmcadc2/vc707/system_bd.tcl +++ b/projects/fmcadc2/vc707/system_bd.tcl @@ -8,3 +8,9 @@ source $ad_hdl_dir/projects/common/vc707/vc707_system_bd.tcl source $ad_hdl_dir/projects/common/xilinx/adcfifo_bd.tcl source ../common/fmcadc2_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/fmcadc2/zc706/Makefile b/projects/fmcadc2/zc706/Makefile index 0d979654e..8b63d8ee2 100644 --- a/projects/fmcadc2/zc706/Makefile +++ b/projects/fmcadc2/zc706/Makefile @@ -25,5 +25,7 @@ LIB_DEPS += jesd204/jesd204_rx LIB_DEPS += xilinx/axi_adcfifo LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/fmcadc2/zc706/system_bd.tcl b/projects/fmcadc2/zc706/system_bd.tcl index a80b70766..93b1fa81b 100644 --- a/projects/fmcadc2/zc706/system_bd.tcl +++ b/projects/fmcadc2/zc706/system_bd.tcl @@ -5,3 +5,9 @@ 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 +#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 "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/fmcadc5/vc707/Makefile b/projects/fmcadc5/vc707/Makefile index 0f104b64f..0d289012f 100644 --- a/projects/fmcadc5/vc707/Makefile +++ b/projects/fmcadc5/vc707/Makefile @@ -23,5 +23,7 @@ LIB_DEPS += util_adcfifo LIB_DEPS += util_mfifo LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/fmcadc5/vc707/system_bd.tcl b/projects/fmcadc5/vc707/system_bd.tcl index 421e6f80b..88d93b4a3 100644 --- a/projects/fmcadc5/vc707/system_bd.tcl +++ b/projects/fmcadc5/vc707/system_bd.tcl @@ -8,6 +8,13 @@ source $ad_hdl_dir/projects/common/vc707/vc707_system_bd.tcl source $ad_hdl_dir/projects/common/xilinx/adcfifo_bd.tcl source ../common/fmcadc5_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + # ila ad_ip_instance util_mfifo mfifo_adc diff --git a/projects/fmcjesdadc1/kc705/Makefile b/projects/fmcjesdadc1/kc705/Makefile index f854ec551..0116b15e5 100644 --- a/projects/fmcjesdadc1/kc705/Makefile +++ b/projects/fmcjesdadc1/kc705/Makefile @@ -22,5 +22,7 @@ LIB_DEPS += util_bsplit LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/fmcjesdadc1/kc705/system_bd.tcl b/projects/fmcjesdadc1/kc705/system_bd.tcl index 6823096c7..b41153c80 100644 --- a/projects/fmcjesdadc1/kc705/system_bd.tcl +++ b/projects/fmcjesdadc1/kc705/system_bd.tcl @@ -2,6 +2,13 @@ source $ad_hdl_dir/projects/common/kc705/kc705_system_bd.tcl source ../common/fmcjesdadc1_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + ad_ip_parameter axi_ad9250_0_dma CONFIG.DMA_DATA_WIDTH_DEST 512 ad_ip_parameter axi_ad9250_0_dma CONFIG.FIFO_SIZE 32 ad_ip_parameter axi_ad9250_1_dma CONFIG.DMA_DATA_WIDTH_DEST 512 diff --git a/projects/fmcjesdadc1/vc707/Makefile b/projects/fmcjesdadc1/vc707/Makefile index 72ba9637e..32691b198 100644 --- a/projects/fmcjesdadc1/vc707/Makefile +++ b/projects/fmcjesdadc1/vc707/Makefile @@ -22,5 +22,7 @@ LIB_DEPS += util_bsplit LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/fmcjesdadc1/vc707/system_bd.tcl b/projects/fmcjesdadc1/vc707/system_bd.tcl index 442aa9d92..20290be52 100644 --- a/projects/fmcjesdadc1/vc707/system_bd.tcl +++ b/projects/fmcjesdadc1/vc707/system_bd.tcl @@ -2,6 +2,13 @@ source $ad_hdl_dir/projects/common/vc707/vc707_system_bd.tcl source ../common/fmcjesdadc1_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + ad_ip_parameter axi_ad9250_0_dma CONFIG.DMA_DATA_WIDTH_DEST 256 ad_ip_parameter axi_ad9250_0_dma CONFIG.FIFO_SIZE 32 ad_ip_parameter axi_ad9250_1_dma CONFIG.DMA_DATA_WIDTH_DEST 256 diff --git a/projects/fmcjesdadc1/zc706/Makefile b/projects/fmcjesdadc1/zc706/Makefile index e6d23d1fc..d478f96a7 100644 --- a/projects/fmcjesdadc1/zc706/Makefile +++ b/projects/fmcjesdadc1/zc706/Makefile @@ -24,5 +24,7 @@ LIB_DEPS += util_bsplit LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/fmcjesdadc1/zc706/system_bd.tcl b/projects/fmcjesdadc1/zc706/system_bd.tcl index e662581c8..b219d8924 100644 --- a/projects/fmcjesdadc1/zc706/system_bd.tcl +++ b/projects/fmcjesdadc1/zc706/system_bd.tcl @@ -2,4 +2,9 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source ../common/fmcjesdadc1_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/fmcomms11/zc706/Makefile b/projects/fmcomms11/zc706/Makefile index 71ab41d0d..0b669666b 100644 --- a/projects/fmcomms11/zc706/Makefile +++ b/projects/fmcomms11/zc706/Makefile @@ -30,5 +30,7 @@ LIB_DEPS += util_pack/util_upack2 LIB_DEPS += xilinx/axi_adcfifo LIB_DEPS += xilinx/axi_adxcvr LIB_DEPS += xilinx/util_adxcvr +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/fmcomms11/zc706/system_bd.tcl b/projects/fmcomms11/zc706/system_bd.tcl index 95c7867ce..ba02580b1 100644 --- a/projects/fmcomms11/zc706/system_bd.tcl +++ b/projects/fmcomms11/zc706/system_bd.tcl @@ -17,3 +17,9 @@ set adc_fifo_address_width 15 source ../common/fmcomms11_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring diff --git a/projects/fmcomms2/kc705/Makefile b/projects/fmcomms2/kc705/Makefile index def4677e8..0705c74fb 100644 --- a/projects/fmcomms2/kc705/Makefile +++ b/projects/fmcomms2/kc705/Makefile @@ -20,5 +20,7 @@ LIB_DEPS += util_rfifo LIB_DEPS += util_tdd_sync LIB_DEPS += util_wfifo LIB_DEPS += xilinx/util_clkdiv +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/fmcomms2/kc705/system_bd.tcl b/projects/fmcomms2/kc705/system_bd.tcl index d5c6bea53..af90bf956 100644 --- a/projects/fmcomms2/kc705/system_bd.tcl +++ b/projects/fmcomms2/kc705/system_bd.tcl @@ -2,5 +2,12 @@ source $ad_hdl_dir/projects/common/kc705/kc705_system_bd.tcl source ../common/fmcomms2_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 31 diff --git a/projects/fmcomms2/kcu105/Makefile b/projects/fmcomms2/kcu105/Makefile index df37588f4..a48c2d05b 100644 --- a/projects/fmcomms2/kcu105/Makefile +++ b/projects/fmcomms2/kcu105/Makefile @@ -21,5 +21,7 @@ LIB_DEPS += util_rfifo LIB_DEPS += util_tdd_sync LIB_DEPS += util_wfifo LIB_DEPS += xilinx/util_clkdiv +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/fmcomms2/kcu105/system_bd.tcl b/projects/fmcomms2/kcu105/system_bd.tcl index 9bbd1f73d..e03fc7bf2 100644 --- a/projects/fmcomms2/kcu105/system_bd.tcl +++ b/projects/fmcomms2/kcu105/system_bd.tcl @@ -3,6 +3,13 @@ source $ad_hdl_dir/projects/common/kcu105/kcu105_system_bd.tcl source $ad_hdl_dir/projects/common/kcu105/kcu105_system_mig.tcl source ../common/fmcomms2_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + 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/Makefile b/projects/fmcomms2/vc707/Makefile index 9c58a7a99..99ae5244b 100644 --- a/projects/fmcomms2/vc707/Makefile +++ b/projects/fmcomms2/vc707/Makefile @@ -20,5 +20,7 @@ LIB_DEPS += util_rfifo LIB_DEPS += util_tdd_sync LIB_DEPS += util_wfifo LIB_DEPS += xilinx/util_clkdiv +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/fmcomms2/vc707/system_bd.tcl b/projects/fmcomms2/vc707/system_bd.tcl index 224969d52..fde6d6688 100644 --- a/projects/fmcomms2/vc707/system_bd.tcl +++ b/projects/fmcomms2/vc707/system_bd.tcl @@ -2,5 +2,12 @@ source $ad_hdl_dir/projects/common/vc707/vc707_system_bd.tcl source ../common/fmcomms2_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 22 diff --git a/projects/fmcomms2/zc702/Makefile b/projects/fmcomms2/zc702/Makefile index 523f46121..cb4f77fd9 100644 --- a/projects/fmcomms2/zc702/Makefile +++ b/projects/fmcomms2/zc702/Makefile @@ -22,5 +22,7 @@ LIB_DEPS += util_rfifo LIB_DEPS += util_tdd_sync LIB_DEPS += util_wfifo LIB_DEPS += xilinx/util_clkdiv +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/fmcomms2/zc702/system_bd.tcl b/projects/fmcomms2/zc702/system_bd.tcl index e11537d70..a176dc7f5 100644 --- a/projects/fmcomms2/zc702/system_bd.tcl +++ b/projects/fmcomms2/zc702/system_bd.tcl @@ -2,5 +2,12 @@ source $ad_hdl_dir/projects/common/zc702/zc702_system_bd.tcl source ../common/fmcomms2_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 23 diff --git a/projects/fmcomms2/zc706/Makefile b/projects/fmcomms2/zc706/Makefile index 811ed8dec..d67dae42a 100644 --- a/projects/fmcomms2/zc706/Makefile +++ b/projects/fmcomms2/zc706/Makefile @@ -22,5 +22,7 @@ LIB_DEPS += util_rfifo LIB_DEPS += util_tdd_sync LIB_DEPS += util_wfifo LIB_DEPS += xilinx/util_clkdiv +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/fmcomms2/zc706/system_bd.tcl b/projects/fmcomms2/zc706/system_bd.tcl index f053f056d..d7667cf1a 100644 --- a/projects/fmcomms2/zc706/system_bd.tcl +++ b/projects/fmcomms2/zc706/system_bd.tcl @@ -2,5 +2,12 @@ source $ad_hdl_dir/projects/common/zc706/zc706_system_bd.tcl source ../common/fmcomms2_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 20 diff --git a/projects/fmcomms2/zcu102/Makefile b/projects/fmcomms2/zcu102/Makefile index 15728c49f..7d8fb63d8 100644 --- a/projects/fmcomms2/zcu102/Makefile +++ b/projects/fmcomms2/zcu102/Makefile @@ -19,5 +19,7 @@ LIB_DEPS += util_rfifo LIB_DEPS += util_tdd_sync LIB_DEPS += util_wfifo LIB_DEPS += xilinx/util_clkdiv +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/fmcomms2/zcu102/system_bd.tcl b/projects/fmcomms2/zcu102/system_bd.tcl index e90f6fed4..4ebc394e4 100644 --- a/projects/fmcomms2/zcu102/system_bd.tcl +++ b/projects/fmcomms2/zcu102/system_bd.tcl @@ -2,6 +2,13 @@ source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source ../common/fmcomms2_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + 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/zed/Makefile b/projects/fmcomms2/zed/Makefile index 409001761..1cfe5a64b 100644 --- a/projects/fmcomms2/zed/Makefile +++ b/projects/fmcomms2/zed/Makefile @@ -24,5 +24,7 @@ LIB_DEPS += util_rfifo LIB_DEPS += util_tdd_sync LIB_DEPS += util_wfifo LIB_DEPS += xilinx/util_clkdiv +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/fmcomms2/zed/system_bd.tcl b/projects/fmcomms2/zed/system_bd.tcl index 76f8cb26f..c126c2774 100644 --- a/projects/fmcomms2/zed/system_bd.tcl +++ b/projects/fmcomms2/zed/system_bd.tcl @@ -2,5 +2,12 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source ../common/fmcomms2_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 23 diff --git a/projects/fmcomms5/zc702/Makefile b/projects/fmcomms5/zc702/Makefile index 7e9a65e7c..307b88814 100644 --- a/projects/fmcomms5/zc702/Makefile +++ b/projects/fmcomms5/zc702/Makefile @@ -21,5 +21,7 @@ LIB_DEPS += util_pack/util_upack2 LIB_DEPS += util_rfifo LIB_DEPS += util_wfifo LIB_DEPS += xilinx/util_clkdiv +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/fmcomms5/zc702/system_bd.tcl b/projects/fmcomms5/zc702/system_bd.tcl index d07a28bf8..2a049ccbb 100644 --- a/projects/fmcomms5/zc702/system_bd.tcl +++ b/projects/fmcomms5/zc702/system_bd.tcl @@ -1,6 +1,13 @@ 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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + ad_ip_parameter sys_ps7 CONFIG.PCW_EN_CLK2_PORT 1 ad_ip_parameter sys_ps7 CONFIG.PCW_FPGA2_PERIPHERAL_FREQMHZ 150.0 ad_connect sys_dma_clk sys_ps7/FCLK_CLK2 diff --git a/projects/fmcomms5/zc706/Makefile b/projects/fmcomms5/zc706/Makefile index b2b803ce4..67142cf7a 100644 --- a/projects/fmcomms5/zc706/Makefile +++ b/projects/fmcomms5/zc706/Makefile @@ -21,5 +21,7 @@ LIB_DEPS += util_pack/util_upack2 LIB_DEPS += util_rfifo LIB_DEPS += util_wfifo LIB_DEPS += xilinx/util_clkdiv +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/fmcomms5/zc706/system_bd.tcl b/projects/fmcomms5/zc706/system_bd.tcl index dfac7b50d..aa0d74c81 100644 --- a/projects/fmcomms5/zc706/system_bd.tcl +++ b/projects/fmcomms5/zc706/system_bd.tcl @@ -1,6 +1,13 @@ 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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + ad_ip_parameter sys_ps7 CONFIG.PCW_EN_CLK2_PORT 1 ad_ip_parameter sys_ps7 CONFIG.PCW_FPGA2_PERIPHERAL_FREQMHZ 200.0 ad_connect sys_dma_clk sys_ps7/FCLK_CLK2 diff --git a/projects/fmcomms5/zcu102/Makefile b/projects/fmcomms5/zcu102/Makefile index 7e0112073..f3d1706c6 100644 --- a/projects/fmcomms5/zcu102/Makefile +++ b/projects/fmcomms5/zcu102/Makefile @@ -18,5 +18,7 @@ LIB_DEPS += util_pack/util_upack2 LIB_DEPS += util_rfifo LIB_DEPS += util_wfifo LIB_DEPS += xilinx/util_clkdiv +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/fmcomms5/zcu102/system_bd.tcl b/projects/fmcomms5/zcu102/system_bd.tcl index bc8da9d24..a95cbfbfe 100644 --- a/projects/fmcomms5/zcu102/system_bd.tcl +++ b/projects/fmcomms5/zcu102/system_bd.tcl @@ -1,8 +1,14 @@ - source $ad_hdl_dir/projects/common/zcu102/zcu102_system_bd.tcl source ../common/fmcomms5_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring + ad_ip_parameter axi_ad9361_0 CONFIG.ADC_INIT_DELAY 8 ad_ip_parameter axi_ad9361_0 CONFIG.DELAY_REFCLK_FREQUENCY 500 ad_ip_parameter axi_ad9361_1 CONFIG.ADC_INIT_DELAY 8 diff --git a/projects/imageon/zed/Makefile b/projects/imageon/zed/Makefile index 64df89363..050f2987d 100644 --- a/projects/imageon/zed/Makefile +++ b/projects/imageon/zed/Makefile @@ -17,5 +17,7 @@ LIB_DEPS += axi_i2s_adi LIB_DEPS += axi_spdif_rx LIB_DEPS += axi_spdif_tx LIB_DEPS += util_i2c_mixer +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom include ../../scripts/project-xilinx.mk diff --git a/projects/imageon/zed/system_bd.tcl b/projects/imageon/zed/system_bd.tcl index 6c88ad0d6..9e368ab44 100644 --- a/projects/imageon/zed/system_bd.tcl +++ b/projects/imageon/zed/system_bd.tcl @@ -2,3 +2,9 @@ source $ad_hdl_dir/projects/common/zed/zed_system_bd.tcl source ../common/imageon_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.ROM_ADDR_BITS 9 +set sys_cstring "sys rom custom string placeholder" +sysid_gen_sys_init_file $sys_cstring