From 9260979b1583248ae8236caf5948060324209fc0 Mon Sep 17 00:00:00 2001 From: Sergiu Arpadi Date: Mon, 18 Nov 2019 11:03:07 +0000 Subject: [PATCH] adrv9364: Added sysid to all projects --- projects/adrv9364z7020/ccbob_cmos/Makefile | 2 ++ projects/adrv9364z7020/ccbob_cmos/system_bd.tcl | 6 ++++++ projects/adrv9364z7020/ccbob_lvds/Makefile | 2 ++ projects/adrv9364z7020/ccbob_lvds/system_bd.tcl | 6 ++++++ projects/adrv9364z7020/ccpackrf_lvds/Makefile | 2 ++ projects/adrv9364z7020/ccpackrf_lvds/system_bd.tcl | 6 ++++++ projects/adrv9364z7020/common/adrv9364z7020_bd.tcl | 10 ++++++++++ 7 files changed, 34 insertions(+) diff --git a/projects/adrv9364z7020/ccbob_cmos/Makefile b/projects/adrv9364z7020/ccbob_cmos/Makefile index 923023cd1..576576b6d 100644 --- a/projects/adrv9364z7020/ccbob_cmos/Makefile +++ b/projects/adrv9364z7020/ccbob_cmos/Makefile @@ -15,6 +15,8 @@ M_DEPS += ../../../library/axi_ad9361/axi_ad9361_delay.tcl LIB_DEPS += axi_ad9361 LIB_DEPS += axi_dmac +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom LIB_DEPS += axi_gpreg LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += util_pack/util_upack2 diff --git a/projects/adrv9364z7020/ccbob_cmos/system_bd.tcl b/projects/adrv9364z7020/ccbob_cmos/system_bd.tcl index 08f420593..db2f393d6 100644 --- a/projects/adrv9364z7020/ccbob_cmos/system_bd.tcl +++ b/projects/adrv9364z7020/ccbob_cmos/system_bd.tcl @@ -9,3 +9,9 @@ cfg_ad9361_interface CMOS set_property CONFIG.ADC_INIT_DELAY 30 [get_bd_cells axi_ad9361] +#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/adrv9364z7020/ccbob_lvds/Makefile b/projects/adrv9364z7020/ccbob_lvds/Makefile index 453a36820..25116e966 100644 --- a/projects/adrv9364z7020/ccbob_lvds/Makefile +++ b/projects/adrv9364z7020/ccbob_lvds/Makefile @@ -15,6 +15,8 @@ M_DEPS += ../../../library/axi_ad9361/axi_ad9361_delay.tcl LIB_DEPS += axi_ad9361 LIB_DEPS += axi_dmac +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom LIB_DEPS += axi_gpreg LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += util_pack/util_upack2 diff --git a/projects/adrv9364z7020/ccbob_lvds/system_bd.tcl b/projects/adrv9364z7020/ccbob_lvds/system_bd.tcl index eae7e851a..445bc8d1a 100644 --- a/projects/adrv9364z7020/ccbob_lvds/system_bd.tcl +++ b/projects/adrv9364z7020/ccbob_lvds/system_bd.tcl @@ -6,3 +6,9 @@ cfg_ad9361_interface LVDS set_property CONFIG.ADC_INIT_DELAY 30 [get_bd_cells axi_ad9361] +#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/adrv9364z7020/ccpackrf_lvds/Makefile b/projects/adrv9364z7020/ccpackrf_lvds/Makefile index 0cdb24692..abd356b49 100644 --- a/projects/adrv9364z7020/ccpackrf_lvds/Makefile +++ b/projects/adrv9364z7020/ccpackrf_lvds/Makefile @@ -16,6 +16,8 @@ M_DEPS += ../../../library/axi_ad9361/axi_ad9361_delay.tcl LIB_DEPS += axi_ad9361 LIB_DEPS += axi_dmac +LIB_DEPS += axi_sysid +LIB_DEPS += sysid_rom LIB_DEPS += axi_i2s_adi LIB_DEPS += util_pack/util_cpack2 LIB_DEPS += util_pack/util_upack2 diff --git a/projects/adrv9364z7020/ccpackrf_lvds/system_bd.tcl b/projects/adrv9364z7020/ccpackrf_lvds/system_bd.tcl index 6d00743fb..18dc49366 100644 --- a/projects/adrv9364z7020/ccpackrf_lvds/system_bd.tcl +++ b/projects/adrv9364z7020/ccpackrf_lvds/system_bd.tcl @@ -9,3 +9,9 @@ ad_connect sys_cpu_clk sys_cpu_clk_out set_property CONFIG.ADC_INIT_DELAY 30 [get_bd_cells axi_ad9361] +#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/adrv9364z7020/common/adrv9364z7020_bd.tcl b/projects/adrv9364z7020/common/adrv9364z7020_bd.tcl index 8db2e2158..56f6dfdce 100644 --- a/projects/adrv9364z7020/common/adrv9364z7020_bd.tcl +++ b/projects/adrv9364z7020/common/adrv9364z7020_bd.tcl @@ -148,6 +148,15 @@ 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 + # interrupts ad_connect sys_concat_intc/dout sys_ps7/IRQ_F2P @@ -170,6 +179,7 @@ ad_connect sys_concat_intc/In0 GND # interconnects +ad_cpu_interconnect 0x45000000 axi_sysid_0 ad_cpu_interconnect 0x41600000 axi_iic_main # ad9361