diff --git a/projects/pzsdr1/ccbrk_cmos/system_bd.tcl b/projects/pzsdr1/ccbrk_cmos/system_bd.tcl index 538ec7cab..378bd8d44 100644 --- a/projects/pzsdr1/ccbrk_cmos/system_bd.tcl +++ b/projects/pzsdr1/ccbrk_cmos/system_bd.tcl @@ -2,8 +2,8 @@ source ../common/pzsdr1_bd.tcl source ../common/ccbrk_bd.tcl -set_property -dict [list CONFIG.SEL_0_DIV {2}] $clkdiv -set_property -dict [list CONFIG.SEL_1_DIV {1}] $clkdiv +ad_ip_parameter clkdiv CONFIG.SEL_0_DIV 2 +ad_ip_parameter clkdiv CONFIG.SEL_1_DIV 1 cfg_ad9361_interface CMOS diff --git a/projects/pzsdr1/common/ccbox_bd.tcl b/projects/pzsdr1/common/ccbox_bd.tcl index 3ec363403..82aada665 100644 --- a/projects/pzsdr1/common/ccbox_bd.tcl +++ b/projects/pzsdr1/common/ccbox_bd.tcl @@ -16,16 +16,17 @@ set_property CONFIG.PCW_USE_DMA1 1 [get_bd_cells sys_ps7] create_bd_port -dir O -type clk i2s_mclk create_bd_intf_port -mode Master -vlnv analog.com:interface:i2s_rtl:1.0 i2s -set sys_audio_clkgen [create_bd_cell -type ip -vlnv xilinx.com:ip:clk_wiz:5.3 sys_audio_clkgen] -set_property -dict [list CONFIG.CLKOUT1_REQUESTED_OUT_FREQ {12.288}] $sys_audio_clkgen -set_property -dict [list CONFIG.USE_LOCKED {false}] $sys_audio_clkgen -set_property -dict [list CONFIG.USE_RESET {true} CONFIG.RESET_TYPE {ACTIVE_LOW}] $sys_audio_clkgen -set_property -dict [list CONFIG.USE_PHASE_ALIGNMENT false] $sys_audio_clkgen -set_property -dict [list CONFIG.PRIM_SOURCE No_buffer] $sys_audio_clkgen +ad_ip_instance clk_wiz sys_audio_clkgen +ad_ip_parameter sys_audio_clkgen CONFIG.CLKOUT1_REQUESTED_OUT_FREQ 12.288 +ad_ip_parameter sys_audio_clkgen CONFIG.USE_LOCKED false +ad_ip_parameter sys_audio_clkgen CONFIG.USE_RESET true +ad_ip_parameter sys_audio_clkgen CONFIG.RESET_TYPE ACTIVE_LOW +ad_ip_parameter sys_audio_clkgen CONFIG.USE_PHASE_ALIGNMENT false +ad_ip_parameter sys_audio_clkgen CONFIG.PRIM_SOURCE No_buffer -set axi_i2s_adi [create_bd_cell -type ip -vlnv analog.com:user:axi_i2s_adi:1.0 axi_i2s_adi] -set_property -dict [list CONFIG.DMA_TYPE {1}] $axi_i2s_adi -set_property -dict [list CONFIG.S_AXI_ADDRESS_WIDTH {16}] $axi_i2s_adi +ad_ip_instance axi_i2s_adi axi_i2s_adi +ad_ip_parameter axi_i2s_adi CONFIG.DMA_TYPE 1 +ad_ip_parameter axi_i2s_adi CONFIG.S_AXI_ADDRESS_WIDTH 16 ad_connect sys_200m_clk sys_audio_clkgen/clk_in1 ad_connect sys_cpu_resetn sys_audio_clkgen/resetn diff --git a/projects/pzsdr1/common/ccbrk_bd.tcl b/projects/pzsdr1/common/ccbrk_bd.tcl index 940a3869f..16086371f 100644 --- a/projects/pzsdr1/common/ccbrk_bd.tcl +++ b/projects/pzsdr1/common/ccbrk_bd.tcl @@ -6,9 +6,9 @@ ad_connect sys_ps7/ENET1_GMII_TX_CLK GND # un-used io (regular) -set axi_gpreg [create_bd_cell -type ip -vlnv analog.com:user:axi_gpreg:1.0 axi_gpreg] -set_property -dict [list CONFIG.NUM_OF_CLK_MONS {0}] $axi_gpreg -set_property -dict [list CONFIG.NUM_OF_IO {1}] $axi_gpreg +ad_ip_instance axi_gpreg axi_gpreg +ad_ip_parameter axi_gpreg CONFIG.NUM_OF_CLK_MONS 0 +ad_ip_parameter axi_gpreg CONFIG.NUM_OF_IO 1 create_bd_port -dir I -from 31 -to 0 gp_in_0 create_bd_port -dir O -from 31 -to 0 gp_out_0 diff --git a/projects/pzsdr1/common/ccusb_bd.tcl b/projects/pzsdr1/common/ccusb_bd.tcl index c656a53dd..5c0a63b0e 100644 --- a/projects/pzsdr1/common/ccusb_bd.tcl +++ b/projects/pzsdr1/common/ccusb_bd.tcl @@ -18,18 +18,18 @@ create_bd_port -dir O slwr_n create_bd_port -dir O pktend_n create_bd_port -dir O epswitch_n -set axi_uart [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_uartlite:2.0 axi_uart] -set_property -dict [list CONFIG.C_BAUDRATE {115200}] $axi_uart +ad_ip_instance axi_uartlite axi_uart +ad_ip_parameter axi_uart CONFIG.C_BAUDRATE 115200 -set axi_usb_fx3 [create_bd_cell -type ip -vlnv analog.com:user:axi_usb_fx3:1.0 axi_usb_fx3] +ad_ip_instance axi_usb_fx3 axi_usb_fx3 -set axi_usb_fx3_dma [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_dma:7.1 axi_usb_fx3_dma] -set_property -dict [list CONFIG.c_sg_include_stscntrl_strm {0}] $axi_usb_fx3_dma -set_property -dict [list CONFIG.c_mm2s_burst_size {256}] $axi_usb_fx3_dma -set_property -dict [list CONFIG.c_s2mm_burst_size {256}] $axi_usb_fx3_dma -set_property -dict [list CONFIG.c_sg_length_width {16}] $axi_usb_fx3_dma +ad_ip_instance axi_dma axi_usb_fx3_dma +ad_ip_parameter axi_usb_fx3_dma CONFIG.c_sg_include_stscntrl_strm 0 +ad_ip_parameter axi_usb_fx3_dma CONFIG.c_mm2s_burst_size 256 +ad_ip_parameter axi_usb_fx3_dma CONFIG.c_s2mm_burst_size 256 +ad_ip_parameter axi_usb_fx3_dma CONFIG.c_sg_length_width 16 -set usb_fx3_rx_axis_fifo [ create_bd_cell -type ip -vlnv xilinx.com:ip:axis_data_fifo:1.1 usb_fx3_rx_axis_fifo ] +ad_ip_instance axis_data_fifo usb_fx3_rx_axis_fifo ad_connect axi_usb_fx3/s_axis axi_usb_fx3_dma/M_AXIS_MM2S diff --git a/projects/pzsdr1/common/pzsdr1_bd.tcl b/projects/pzsdr1/common/pzsdr1_bd.tcl index e99c558b4..9b22689c0 100644 --- a/projects/pzsdr1/common/pzsdr1_bd.tcl +++ b/projects/pzsdr1/common/pzsdr1_bd.tcl @@ -54,74 +54,74 @@ create_bd_port -dir I -type intr ps_intr_15 # instance: sys_ps7 -set sys_ps7 [create_bd_cell -type ip -vlnv xilinx.com:ip:processing_system7:5.5 sys_ps7] -set_property -dict [list CONFIG.PCW_PRESET_BANK0_VOLTAGE {LVCMOS 1.8V}] $sys_ps7 -set_property -dict [list CONFIG.PCW_PRESET_BANK1_VOLTAGE {LVCMOS 1.8V}] $sys_ps7 -set_property -dict [list CONFIG.PCW_PACKAGE_NAME {fbg676}] $sys_ps7 -set_property -dict [list CONFIG.PCW_GPIO_MIO_GPIO_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET0_PERIPHERAL_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET0_ENET0_IO {MIO 16 .. 27}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET0_GRP_MDIO_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET1_PERIPHERAL_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET_RESET_SELECT {Separate reset pins}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET0_RESET_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET0_RESET_IO {MIO 8}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET1_RESET_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET1_RESET_IO {MIO 51}] $sys_ps7 -set_property -dict [list CONFIG.PCW_SD0_PERIPHERAL_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_SD0_GRP_CD_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_SD0_GRP_CD_IO {MIO 50}] $sys_ps7 -set_property -dict [list CONFIG.PCW_SDIO_PERIPHERAL_FREQMHZ {50}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UART1_PERIPHERAL_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_USB0_PERIPHERAL_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_USB0_RESET_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_USB0_RESET_IO {MIO 7}] $sys_ps7 -set_property -dict [list CONFIG.PCW_QSPI_PERIPHERAL_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_PARTNO {MT41K256M16 RE-125}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_BUS_WIDTH {32 Bit}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_USE_INTERNAL_VREF {0}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_TRAIN_WRITE_LEVEL {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_TRAIN_READ_GATE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_TRAIN_DATA_EYE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_DQS_TO_CLK_DELAY_0 {0.110}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_DQS_TO_CLK_DELAY_1 {0.095}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_DQS_TO_CLK_DELAY_2 {0.249}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_DQS_TO_CLK_DELAY_3 {0.249}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_BOARD_DELAY0 {0.202}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_BOARD_DELAY1 {0.217}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_BOARD_DELAY2 {0.216}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_BOARD_DELAY3 {0.217}] $sys_ps7 -set_property -dict [list CONFIG.PCW_TTC0_PERIPHERAL_ENABLE {0}] $sys_ps7 -set_property -dict [list CONFIG.PCW_EN_CLK1_PORT {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_EN_RST1_PORT {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_EN_CLK2_PORT {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_EN_RST2_PORT {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_FPGA0_PERIPHERAL_FREQMHZ {100.0}] $sys_ps7 -set_property -dict [list CONFIG.PCW_FPGA1_PERIPHERAL_FREQMHZ {200.0}] $sys_ps7 -set_property -dict [list CONFIG.PCW_FPGA2_PERIPHERAL_FREQMHZ {200.0}] $sys_ps7 -set_property -dict [list CONFIG.PCW_USE_FABRIC_INTERRUPT {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_IRQ_F2P_INTR {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_GPIO_EMIO_GPIO_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_GPIO_EMIO_GPIO_IO {64}] $sys_ps7 -set_property -dict [list CONFIG.PCW_IRQ_F2P_MODE {REVERSE}] $sys_ps7 -set_property -dict [list CONFIG.PCW_SPI0_PERIPHERAL_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_SPI0_SPI0_IO {EMIO}] $sys_ps7 -set_property -dict [list CONFIG.PCW_SPI1_PERIPHERAL_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_SPI1_SPI1_IO {EMIO}] $sys_ps7 +ad_ip_instance processing_system7 sys_ps7 +ad_ip_parameter sys_ps7 CONFIG.PCW_PRESET_BANK0_VOLTAGE "LVCMOS 1.8V" +ad_ip_parameter sys_ps7 CONFIG.PCW_PRESET_BANK1_VOLTAGE "LVCMOS 1.8V" +ad_ip_parameter sys_ps7 CONFIG.PCW_PACKAGE_NAME fbg676 +ad_ip_parameter sys_ps7 CONFIG.PCW_GPIO_MIO_GPIO_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET0_PERIPHERAL_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET0_ENET0_IO "MIO 16 .. 27" +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET0_GRP_MDIO_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET1_PERIPHERAL_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET_RESET_SELECT "Separate reset pins" +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET0_RESET_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET0_RESET_IO "MIO 8" +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET1_RESET_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET1_RESET_IO "MIO 51" +ad_ip_parameter sys_ps7 CONFIG.PCW_SD0_PERIPHERAL_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_SD0_GRP_CD_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_SD0_GRP_CD_IO "MIO 50" +ad_ip_parameter sys_ps7 CONFIG.PCW_SDIO_PERIPHERAL_FREQMHZ 50 +ad_ip_parameter sys_ps7 CONFIG.PCW_UART1_PERIPHERAL_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_USB0_PERIPHERAL_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_USB0_RESET_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_USB0_RESET_IO "MIO 7" +ad_ip_parameter sys_ps7 CONFIG.PCW_QSPI_PERIPHERAL_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_PARTNO "MT41K256M16 RE-125" +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_BUS_WIDTH "32 Bit" +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_USE_INTERNAL_VREF 0 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_TRAIN_WRITE_LEVEL 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_TRAIN_READ_GATE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_TRAIN_DATA_EYE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_DQS_TO_CLK_DELAY_0 0.110 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_DQS_TO_CLK_DELAY_1 0.095 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_DQS_TO_CLK_DELAY_2 0.249 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_DQS_TO_CLK_DELAY_3 0.249 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_BOARD_DELAY0 0.202 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_BOARD_DELAY1 0.217 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_BOARD_DELAY2 0.216 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_BOARD_DELAY3 0.217 +ad_ip_parameter sys_ps7 CONFIG.PCW_TTC0_PERIPHERAL_ENABLE 0 +ad_ip_parameter sys_ps7 CONFIG.PCW_EN_CLK1_PORT 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_EN_RST1_PORT 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_EN_CLK2_PORT 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_EN_RST2_PORT 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_FPGA0_PERIPHERAL_FREQMHZ 100.0 +ad_ip_parameter sys_ps7 CONFIG.PCW_FPGA1_PERIPHERAL_FREQMHZ 200.0 +ad_ip_parameter sys_ps7 CONFIG.PCW_FPGA2_PERIPHERAL_FREQMHZ 200.0 +ad_ip_parameter sys_ps7 CONFIG.PCW_USE_FABRIC_INTERRUPT 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_IRQ_F2P_INTR 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_GPIO_EMIO_GPIO_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_GPIO_EMIO_GPIO_IO 64 +ad_ip_parameter sys_ps7 CONFIG.PCW_IRQ_F2P_MODE REVERSE +ad_ip_parameter sys_ps7 CONFIG.PCW_SPI0_PERIPHERAL_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_SPI0_SPI0_IO EMIO +ad_ip_parameter sys_ps7 CONFIG.PCW_SPI1_PERIPHERAL_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_SPI1_SPI1_IO EMIO -set axi_iic_main [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_iic:2.0 axi_iic_main] -set_property -dict [list CONFIG.USE_BOARD_FLOW {true}] $axi_iic_main -set_property -dict [list CONFIG.IIC_BOARD_INTERFACE {Custom}] $axi_iic_main +ad_ip_instance axi_iic axi_iic_main +ad_ip_parameter axi_iic_main CONFIG.USE_BOARD_FLOW true +ad_ip_parameter axi_iic_main CONFIG.IIC_BOARD_INTERFACE Custom -set sys_concat_intc [create_bd_cell -type ip -vlnv xilinx.com:ip:xlconcat:2.1 sys_concat_intc] -set_property -dict [list CONFIG.NUM_PORTS {16}] $sys_concat_intc +ad_ip_instance xlconcat sys_concat_intc +ad_ip_parameter sys_concat_intc CONFIG.NUM_PORTS 16 -set sys_rstgen [create_bd_cell -type ip -vlnv xilinx.com:ip:proc_sys_reset:5.0 sys_rstgen] -set_property -dict [list CONFIG.C_EXT_RST_WIDTH {1}] $sys_rstgen +ad_ip_instance proc_sys_reset sys_rstgen +ad_ip_parameter sys_rstgen CONFIG.C_EXT_RST_WIDTH 1 -set sys_logic_inv [create_bd_cell -type ip -vlnv xilinx.com:ip:util_vector_logic:2.0 sys_logic_inv] -set_property -dict [list CONFIG.C_SIZE {1}] $sys_logic_inv -set_property -dict [list CONFIG.C_OPERATION {not}] $sys_logic_inv +ad_ip_instance util_vector_logic sys_logic_inv +ad_ip_parameter sys_logic_inv CONFIG.C_SIZE 1 +ad_ip_parameter sys_logic_inv CONFIG.C_OPERATION not # system reset/clock definitions @@ -201,60 +201,60 @@ create_bd_port -dir O tdd_sync_t # ad9361 core -set axi_ad9361 [create_bd_cell -type ip -vlnv analog.com:user:axi_ad9361:1.0 axi_ad9361] -set_property -dict [list CONFIG.ID {0}] $axi_ad9361 -set_property -dict [list CONFIG.DAC_IODELAY_ENABLE {0}] $axi_ad9361 +ad_ip_instance axi_ad9361 axi_ad9361 +ad_ip_parameter axi_ad9361 CONFIG.ID 0 +ad_ip_parameter axi_ad9361 CONFIG.DAC_IODELAY_ENABLE 0 -set axi_ad9361_dac_dma [create_bd_cell -type ip -vlnv analog.com:user:axi_dmac:1.0 axi_ad9361_dac_dma] -set_property -dict [list CONFIG.DMA_TYPE_SRC {0}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.DMA_TYPE_DEST {2}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.CYCLIC {1}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.AXI_SLICE_SRC {0}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.AXI_SLICE_DEST {1}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.DMA_2D_TRANSFER {0}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.DMA_DATA_WIDTH_DEST {64}] $axi_ad9361_dac_dma +ad_ip_instance axi_dmac axi_ad9361_dac_dma +ad_ip_parameter axi_ad9361_dac_dma CONFIG.DMA_TYPE_SRC 0 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.DMA_TYPE_DEST 2 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.CYCLIC 1 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.AXI_SLICE_SRC 0 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.AXI_SLICE_DEST 1 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.DMA_2D_TRANSFER 0 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.DMA_DATA_WIDTH_DEST 64 -set util_ad9361_dac_upack [create_bd_cell -type ip -vlnv analog.com:user:util_upack:1.0 util_ad9361_dac_upack] -set_property -dict [list CONFIG.NUM_OF_CHANNELS {4}] $util_ad9361_dac_upack -set_property -dict [list CONFIG.CHANNEL_DATA_WIDTH {16}] $util_ad9361_dac_upack +ad_ip_instance util_upack util_ad9361_dac_upack +ad_ip_parameter util_ad9361_dac_upack CONFIG.NUM_OF_CHANNELS 4 +ad_ip_parameter util_ad9361_dac_upack CONFIG.CHANNEL_DATA_WIDTH 16 -set axi_ad9361_adc_dma [create_bd_cell -type ip -vlnv analog.com:user:axi_dmac:1.0 axi_ad9361_adc_dma] -set_property -dict [list CONFIG.DMA_TYPE_SRC {2}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.DMA_TYPE_DEST {0}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.CYCLIC {0}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.SYNC_TRANSFER_START {1}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.AXI_SLICE_SRC {0}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.AXI_SLICE_DEST {0}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.DMA_2D_TRANSFER {0}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {64}] $axi_ad9361_adc_dma +ad_ip_instance axi_dmac axi_ad9361_adc_dma +ad_ip_parameter axi_ad9361_adc_dma CONFIG.DMA_TYPE_SRC 2 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.DMA_TYPE_DEST 0 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.CYCLIC 0 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.SYNC_TRANSFER_START 1 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.AXI_SLICE_SRC 0 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.AXI_SLICE_DEST 0 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.DMA_2D_TRANSFER 0 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.DMA_DATA_WIDTH_SRC 64 -set util_ad9361_adc_pack [create_bd_cell -type ip -vlnv analog.com:user:util_cpack:1.0 util_ad9361_adc_pack] -set_property -dict [list CONFIG.NUM_OF_CHANNELS {4}] $util_ad9361_adc_pack -set_property -dict [list CONFIG.CHANNEL_DATA_WIDTH {16}] $util_ad9361_adc_pack +ad_ip_instance util_cpack util_ad9361_adc_pack +ad_ip_parameter util_ad9361_adc_pack CONFIG.NUM_OF_CHANNELS 4 +ad_ip_parameter util_ad9361_adc_pack CONFIG.CHANNEL_DATA_WIDTH 16 -set util_ad9361_adc_fifo [create_bd_cell -type ip -vlnv analog.com:user:util_wfifo:1.0 util_ad9361_adc_fifo] -set_property -dict [list CONFIG.NUM_OF_CHANNELS {4}] $util_ad9361_adc_fifo -set_property -dict [list CONFIG.DIN_ADDRESS_WIDTH {4}] $util_ad9361_adc_fifo -set_property -dict [list CONFIG.DIN_DATA_WIDTH {16}] $util_ad9361_adc_fifo -set_property -dict [list CONFIG.DOUT_DATA_WIDTH {16}] $util_ad9361_adc_fifo +ad_ip_instance util_wfifo util_ad9361_adc_fifo +ad_ip_parameter util_ad9361_adc_fifo CONFIG.NUM_OF_CHANNELS 4 +ad_ip_parameter util_ad9361_adc_fifo CONFIG.DIN_ADDRESS_WIDTH 4 +ad_ip_parameter util_ad9361_adc_fifo CONFIG.DIN_DATA_WIDTH 16 +ad_ip_parameter util_ad9361_adc_fifo CONFIG.DOUT_DATA_WIDTH 16 -set util_ad9361_tdd_sync [create_bd_cell -type ip -vlnv analog.com:user:util_tdd_sync:1.0 util_ad9361_tdd_sync] -set_property -dict [list CONFIG.TDD_SYNC_PERIOD {10000000}] $util_ad9361_tdd_sync +ad_ip_instance util_tdd_sync util_ad9361_tdd_sync +ad_ip_parameter util_ad9361_tdd_sync CONFIG.TDD_SYNC_PERIOD 10000000 -set clkdiv [ create_bd_cell -type ip -vlnv analog.com:user:util_clkdiv:1.0 clkdiv ] +ad_ip_instance util_clkdiv clkdiv -set clkdiv_reset [create_bd_cell -type ip -vlnv xilinx.com:ip:proc_sys_reset:5.0 clkdiv_reset] +ad_ip_instance proc_sys_reset clkdiv_reset -set dac_fifo [create_bd_cell -type ip -vlnv analog.com:user:util_rfifo:1.0 dac_fifo] -set_property -dict [list CONFIG.DIN_DATA_WIDTH {16}] $dac_fifo -set_property -dict [list CONFIG.DOUT_DATA_WIDTH {16}] $dac_fifo -set_property -dict [list CONFIG.DIN_ADDRESS_WIDTH {4}] $dac_fifo +ad_ip_instance util_rfifo dac_fifo +ad_ip_parameter dac_fifo CONFIG.DIN_DATA_WIDTH 16 +ad_ip_parameter dac_fifo CONFIG.DOUT_DATA_WIDTH 16 +ad_ip_parameter dac_fifo CONFIG.DIN_ADDRESS_WIDTH 4 -set clkdiv_sel_logic [create_bd_cell -type ip -vlnv xilinx.com:ip:util_reduced_logic:2.0 clkdiv_sel_logic] -set_property -dict [list CONFIG.C_SIZE {2}] $clkdiv_sel_logic +ad_ip_instance util_reduced_logic clkdiv_sel_logic +ad_ip_parameter clkdiv_sel_logic CONFIG.C_SIZE 2 -set concat_logic [create_bd_cell -type ip -vlnv xilinx.com:ip:xlconcat:2.1 concat_logic] -set_property -dict [list CONFIG.NUM_PORTS {2}] $concat_logic +ad_ip_instance xlconcat concat_logic +ad_ip_parameter concat_logic CONFIG.NUM_PORTS 2 # connections diff --git a/projects/pzsdr2/ccbrk_cmos/system_bd.tcl b/projects/pzsdr2/ccbrk_cmos/system_bd.tcl index eca813301..db5fb55f5 100644 --- a/projects/pzsdr2/ccbrk_cmos/system_bd.tcl +++ b/projects/pzsdr2/ccbrk_cmos/system_bd.tcl @@ -2,10 +2,10 @@ source ../common/pzsdr2_bd.tcl source ../common/ccbrk_bd.tcl -set_property -dict [list CONFIG.SEL_0_DIV {2}] $clkdiv -set_property -dict [list CONFIG.SEL_1_DIV {1}] $clkdiv +ad_ip_parameter clkdiv CONFIG.SEL_0_DIV 2 +ad_ip_parameter clkdiv CONFIG.SEL_1_DIV 1 cfg_ad9361_interface CMOS -set_property CONFIG.ADC_INIT_DELAY 29 [get_bd_cells axi_ad9361] +ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 29 diff --git a/projects/pzsdr2/ccbrk_lvds/system_bd.tcl b/projects/pzsdr2/ccbrk_lvds/system_bd.tcl index 521eda7cd..596d4607d 100644 --- a/projects/pzsdr2/ccbrk_lvds/system_bd.tcl +++ b/projects/pzsdr2/ccbrk_lvds/system_bd.tcl @@ -4,5 +4,5 @@ source ../common/ccbrk_bd.tcl cfg_ad9361_interface LVDS -set_property CONFIG.ADC_INIT_DELAY 29 [get_bd_cells axi_ad9361] +ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 29 diff --git a/projects/pzsdr2/ccfmc_lvds/system_bd.tcl b/projects/pzsdr2/ccfmc_lvds/system_bd.tcl index 7aa26427d..4b3090a3e 100644 --- a/projects/pzsdr2/ccfmc_lvds/system_bd.tcl +++ b/projects/pzsdr2/ccfmc_lvds/system_bd.tcl @@ -7,5 +7,5 @@ cfg_ad9361_interface LVDS create_bd_port -dir O sys_cpu_clk_out ad_connect sys_cpu_clk sys_cpu_clk_out -set_property CONFIG.ADC_INIT_DELAY 29 [get_bd_cells axi_ad9361] +ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 29 diff --git a/projects/pzsdr2/ccpci_lvds/system_bd.tcl b/projects/pzsdr2/ccpci_lvds/system_bd.tcl index b2c58d2a6..397e2c5d9 100644 --- a/projects/pzsdr2/ccpci_lvds/system_bd.tcl +++ b/projects/pzsdr2/ccpci_lvds/system_bd.tcl @@ -4,5 +4,4 @@ source ../common/ccpci_bd.tcl cfg_ad9361_interface LVDS -set_property CONFIG.ADC_INIT_DELAY 29 [get_bd_cells axi_ad9361] - +ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 29 diff --git a/projects/pzsdr2/ccusb_lvds/system_bd.tcl b/projects/pzsdr2/ccusb_lvds/system_bd.tcl index 4338ce94d..46676d9a7 100644 --- a/projects/pzsdr2/ccusb_lvds/system_bd.tcl +++ b/projects/pzsdr2/ccusb_lvds/system_bd.tcl @@ -4,5 +4,5 @@ source ../common/ccusb_bd.tcl cfg_ad9361_interface LVDS -set_property CONFIG.ADC_INIT_DELAY 29 [get_bd_cells axi_ad9361] +ad_ip_parameter axi_ad9361 CONFIG.ADC_INIT_DELAY 29 diff --git a/projects/pzsdr2/common/ccbox_bd.tcl b/projects/pzsdr2/common/ccbox_bd.tcl index 3ec363403..82aada665 100644 --- a/projects/pzsdr2/common/ccbox_bd.tcl +++ b/projects/pzsdr2/common/ccbox_bd.tcl @@ -16,16 +16,17 @@ set_property CONFIG.PCW_USE_DMA1 1 [get_bd_cells sys_ps7] create_bd_port -dir O -type clk i2s_mclk create_bd_intf_port -mode Master -vlnv analog.com:interface:i2s_rtl:1.0 i2s -set sys_audio_clkgen [create_bd_cell -type ip -vlnv xilinx.com:ip:clk_wiz:5.3 sys_audio_clkgen] -set_property -dict [list CONFIG.CLKOUT1_REQUESTED_OUT_FREQ {12.288}] $sys_audio_clkgen -set_property -dict [list CONFIG.USE_LOCKED {false}] $sys_audio_clkgen -set_property -dict [list CONFIG.USE_RESET {true} CONFIG.RESET_TYPE {ACTIVE_LOW}] $sys_audio_clkgen -set_property -dict [list CONFIG.USE_PHASE_ALIGNMENT false] $sys_audio_clkgen -set_property -dict [list CONFIG.PRIM_SOURCE No_buffer] $sys_audio_clkgen +ad_ip_instance clk_wiz sys_audio_clkgen +ad_ip_parameter sys_audio_clkgen CONFIG.CLKOUT1_REQUESTED_OUT_FREQ 12.288 +ad_ip_parameter sys_audio_clkgen CONFIG.USE_LOCKED false +ad_ip_parameter sys_audio_clkgen CONFIG.USE_RESET true +ad_ip_parameter sys_audio_clkgen CONFIG.RESET_TYPE ACTIVE_LOW +ad_ip_parameter sys_audio_clkgen CONFIG.USE_PHASE_ALIGNMENT false +ad_ip_parameter sys_audio_clkgen CONFIG.PRIM_SOURCE No_buffer -set axi_i2s_adi [create_bd_cell -type ip -vlnv analog.com:user:axi_i2s_adi:1.0 axi_i2s_adi] -set_property -dict [list CONFIG.DMA_TYPE {1}] $axi_i2s_adi -set_property -dict [list CONFIG.S_AXI_ADDRESS_WIDTH {16}] $axi_i2s_adi +ad_ip_instance axi_i2s_adi axi_i2s_adi +ad_ip_parameter axi_i2s_adi CONFIG.DMA_TYPE 1 +ad_ip_parameter axi_i2s_adi CONFIG.S_AXI_ADDRESS_WIDTH 16 ad_connect sys_200m_clk sys_audio_clkgen/clk_in1 ad_connect sys_cpu_resetn sys_audio_clkgen/resetn diff --git a/projects/pzsdr2/common/ccbrk_bd.tcl b/projects/pzsdr2/common/ccbrk_bd.tcl index a09cda635..67b4e6e70 100644 --- a/projects/pzsdr2/common/ccbrk_bd.tcl +++ b/projects/pzsdr2/common/ccbrk_bd.tcl @@ -6,8 +6,8 @@ ad_connect sys_ps7/ENET1_GMII_TX_CLK GND # un-used io (gt) -set axi_pz_xcvrlb [create_bd_cell -type ip -vlnv analog.com:user:axi_xcvrlb:1.0 axi_pz_xcvrlb] -set_property -dict [list CONFIG.NUM_OF_LANES {4}] $axi_pz_xcvrlb +ad_ip_instance axi_xcvrlb axi_pz_xcvrlb +ad_ip_parameter axi_pz_xcvrlb CONFIG.NUM_OF_LANES 4 create_bd_port -dir I gt_ref_clk create_bd_port -dir I -from 3 -to 0 gt_rx_p @@ -24,9 +24,9 @@ ad_connect axi_pz_xcvrlb/tx_n gt_tx_n # un-used io (regular) -set axi_gpreg [create_bd_cell -type ip -vlnv analog.com:user:axi_gpreg:1.0 axi_gpreg] -set_property -dict [list CONFIG.NUM_OF_CLK_MONS {0}] $axi_gpreg -set_property -dict [list CONFIG.NUM_OF_IO {4}] $axi_gpreg +ad_ip_instance axi_gpreg axi_gpreg +ad_ip_parameter axi_gpreg CONFIG.NUM_OF_CLK_MONS 0 +ad_ip_parameter axi_gpreg CONFIG.NUM_OF_IO 4 create_bd_port -dir I -from 31 -to 0 gp_in_0 create_bd_port -dir I -from 31 -to 0 gp_in_1 diff --git a/projects/pzsdr2/common/ccfmc_bd.tcl b/projects/pzsdr2/common/ccfmc_bd.tcl index 4192ee851..586a06e33 100644 --- a/projects/pzsdr2/common/ccfmc_bd.tcl +++ b/projects/pzsdr2/common/ccfmc_bd.tcl @@ -26,45 +26,46 @@ create_bd_port -dir O spdif ## ps7 modifications -set_property -dict [list CONFIG.PCW_USE_DMA0 {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_USE_DMA1 {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_USE_DMA2 {1}] $sys_ps7 +ad_ip_parameter sys_ps7 CONFIG.PCW_USE_DMA0 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_USE_DMA1 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_USE_DMA2 1 # ethernet-1 -set sys_rgmii [create_bd_cell -type ip -vlnv xilinx.com:ip:gmii_to_rgmii:4.0 sys_rgmii] -set_property -dict [list CONFIG.SupportLevel {Include_Shared_Logic_in_Core}] $sys_rgmii +ad_ip_instance gmii_to_rgmii sys_rgmii +ad_ip_parameter sys_rgmii CONFIG.SupportLevel Include_Shared_Logic_in_Core -set sys_rgmii_rstgen [create_bd_cell -type ip -vlnv xilinx.com:ip:proc_sys_reset:5.0 sys_rgmii_rstgen] -set_property -dict [list CONFIG.C_EXT_RST_WIDTH {1}] $sys_rgmii_rstgen +ad_ip_instance proc_sys_reset sys_rgmii_rstgen +ad_ip_parameter sys_rgmii_rstgen CONFIG.C_EXT_RST_WIDTH 1 # hdmi peripherals -set axi_hdmi_clkgen [create_bd_cell -type ip -vlnv analog.com:user:axi_clkgen:1.0 axi_hdmi_clkgen] -set axi_hdmi_core [create_bd_cell -type ip -vlnv analog.com:user:axi_hdmi_tx:1.0 axi_hdmi_core] -set_property -dict [list CONFIG.OUT_CLK_POLARITY {1}] $axi_hdmi_core +ad_ip_instance axi_clkgen axi_hdmi_clkgen +ad_ip_instance axi_hdmi_tx axi_hdmi_core +ad_ip_parameter axi_hdmi_core CONFIG.OUT_CLK_POLARITY 1 -set axi_hdmi_dma [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_vdma:6.2 axi_hdmi_dma] -set_property -dict [list CONFIG.c_m_axis_mm2s_tdata_width {64}] $axi_hdmi_dma -set_property -dict [list CONFIG.c_use_mm2s_fsync {1}] $axi_hdmi_dma -set_property -dict [list CONFIG.c_include_s2mm {0}] $axi_hdmi_dma +ad_ip_instance axi_vdma axi_hdmi_dma +ad_ip_parameter axi_hdmi_dma CONFIG.c_m_axis_mm2s_tdata_width 64 +ad_ip_parameter axi_hdmi_dma CONFIG.c_use_mm2s_fsync 1 +ad_ip_parameter axi_hdmi_dma CONFIG.c_include_s2mm 0 # audio peripherals -set sys_audio_clkgen [create_bd_cell -type ip -vlnv xilinx.com:ip:clk_wiz:5.3 sys_audio_clkgen] -set_property -dict [list CONFIG.CLKOUT1_REQUESTED_OUT_FREQ {12.288}] $sys_audio_clkgen -set_property -dict [list CONFIG.USE_LOCKED {false}] $sys_audio_clkgen -set_property -dict [list CONFIG.USE_RESET {true} CONFIG.RESET_TYPE {ACTIVE_LOW}] $sys_audio_clkgen -set_property -dict [list CONFIG.USE_PHASE_ALIGNMENT false] $sys_audio_clkgen -set_property -dict [list CONFIG.PRIM_SOURCE No_buffer] $sys_audio_clkgen +ad_ip_instance clk_wiz sys_audio_clkgen +ad_ip_parameter sys_audio_clkgen CONFIG.CLKOUT1_REQUESTED_OUT_FREQ 12.288 +ad_ip_parameter sys_audio_clkgen CONFIG.USE_LOCKED false +ad_ip_parameter sys_audio_clkgen CONFIG.USE_RESET true +ad_ip_parameter sys_audio_clkgen CONFIG.RESET_TYPE ACTIVE_LOW +ad_ip_parameter sys_audio_clkgen CONFIG.USE_PHASE_ALIGNMENT false +ad_ip_parameter sys_audio_clkgen CONFIG.PRIM_SOURCE No_buffer -set axi_spdif_tx_core [create_bd_cell -type ip -vlnv analog.com:user:axi_spdif_tx:1.0 axi_spdif_tx_core] -set_property -dict [list CONFIG.DMA_TYPE {1}] $axi_spdif_tx_core -set_property -dict [list CONFIG.S_AXI_ADDRESS_WIDTH {16}] $axi_spdif_tx_core +ad_ip_instance axi_spdif_tx axi_spdif_tx_core +ad_ip_parameter axi_spdif_tx_core CONFIG.DMA_TYPE 1 +ad_ip_parameter axi_spdif_tx_core CONFIG.S_AXI_ADDRESS_WIDTH 16 -set axi_i2s_adi [create_bd_cell -type ip -vlnv analog.com:user:axi_i2s_adi:1.0 axi_i2s_adi] -set_property -dict [list CONFIG.DMA_TYPE {1}] $axi_i2s_adi -set_property -dict [list CONFIG.S_AXI_ADDRESS_WIDTH {16}] $axi_i2s_adi +ad_ip_instance axi_i2s_adi axi_i2s_adi +ad_ip_parameter axi_i2s_adi CONFIG.DMA_TYPE 1 +ad_ip_parameter axi_i2s_adi CONFIG.S_AXI_ADDRESS_WIDTH 16 # system reset/clock definitions @@ -140,8 +141,8 @@ ad_mem_hp0_interconnect sys_cpu_clk axi_hdmi_dma/M_AXI_MM2S # un-used io (gt) -set axi_pz_xcvrlb [create_bd_cell -type ip -vlnv analog.com:user:axi_xcvrlb:1.0 axi_pz_xcvrlb] -set_property -dict [list CONFIG.NUM_OF_LANES {2}] $axi_pz_xcvrlb +ad_ip_instance axi_xcvrlb axi_pz_xcvrlb +ad_ip_parameter axi_pz_xcvrlb CONFIG.NUM_OF_LANES 2 create_bd_port -dir I gt_ref_clk_0 create_bd_port -dir I -from 1 -to 0 gt_rx_p @@ -158,12 +159,12 @@ ad_connect axi_pz_xcvrlb/tx_n gt_tx_n # un-used io (regular) -set axi_gpreg [create_bd_cell -type ip -vlnv analog.com:user:axi_gpreg:1.0 axi_gpreg] -set_property -dict [list CONFIG.NUM_OF_CLK_MONS {3}] $axi_gpreg -set_property -dict [list CONFIG.NUM_OF_IO {2}] $axi_gpreg -set_property -dict [list CONFIG.BUF_ENABLE_0 {1}] $axi_gpreg -set_property -dict [list CONFIG.BUF_ENABLE_1 {1}] $axi_gpreg -set_property -dict [list CONFIG.BUF_ENABLE_2 {1}] $axi_gpreg +ad_ip_instance axi_gpreg axi_gpreg +ad_ip_parameter axi_gpreg CONFIG.NUM_OF_CLK_MONS 3 +ad_ip_parameter axi_gpreg CONFIG.NUM_OF_IO 2 +ad_ip_parameter axi_gpreg CONFIG.BUF_ENABLE_0 1 +ad_ip_parameter axi_gpreg CONFIG.BUF_ENABLE_1 1 +ad_ip_parameter axi_gpreg CONFIG.BUF_ENABLE_2 1 create_bd_port -dir I -from 31 -to 0 gp_in_0 create_bd_port -dir I -from 31 -to 0 gp_in_1 diff --git a/projects/pzsdr2/common/ccpci_bd.tcl b/projects/pzsdr2/common/ccpci_bd.tcl index d42c21121..cb7f4532a 100644 --- a/projects/pzsdr2/common/ccpci_bd.tcl +++ b/projects/pzsdr2/common/ccpci_bd.tcl @@ -6,10 +6,10 @@ ad_connect sys_ps7/ENET1_GMII_TX_CLK GND # peripherals in pl -set axi_spi [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_quad_spi:3.2 axi_spi] -set_property -dict [list CONFIG.C_USE_STARTUP {0}] $axi_spi -set_property -dict [list CONFIG.C_NUM_SS_BITS {8}] $axi_spi -set_property -dict [list CONFIG.C_SCK_RATIO {8}] $axi_spi +ad_ip_instance axi_quad_spi axi_spi +ad_ip_parameter axi_spi CONFIG.C_USE_STARTUP 0 +ad_ip_parameter axi_spi CONFIG.C_NUM_SS_BITS 8 +ad_ip_parameter axi_spi CONFIG.C_SCK_RATIO 8 create_bd_port -dir O -from 7 -to 0 pl_spi_csn_o create_bd_port -dir I -from 7 -to 0 pl_spi_csn_i @@ -27,11 +27,11 @@ ad_connect pl_spi_sdo_i axi_spi/io0_i ad_connect pl_spi_sdo_o axi_spi/io0_o ad_connect pl_spi_sdi_i axi_spi/io1_i -set axi_gpio [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_gpio:2.0 axi_gpio] -set_property -dict [list CONFIG.C_IS_DUAL {1}] $axi_gpio -set_property -dict [list CONFIG.C_GPIO_WIDTH {32}] $axi_gpio -set_property -dict [list CONFIG.C_GPIO2_WIDTH {32}] $axi_gpio -set_property -dict [list CONFIG.C_INTERRUPT_PRESENT {1}] $axi_gpio +ad_ip_instance axi_gpio axi_gpio +ad_ip_parameter axi_gpio CONFIG.C_IS_DUAL 1 +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 create_bd_port -dir I -from 31 -to 0 pl_gpio0_i create_bd_port -dir O -from 31 -to 0 pl_gpio0_o @@ -49,31 +49,31 @@ ad_connect pl_gpio1_t axi_gpio/gpio2_io_t # pci-express -set axi_pcie_x4 [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_pcie:2.8 axi_pcie_x4] -set_property -dict [list CONFIG.NO_OF_LANES {X4}] $axi_pcie_x4 -set_property -dict [list CONFIG.MAX_LINK_SPEED {5.0_GT/s}] $axi_pcie_x4 -set_property -dict [list CONFIG.VENDOR_ID {0x11D4}] $axi_pcie_x4 -set_property -dict [list CONFIG.DEVICE_ID {0x9361}] $axi_pcie_x4 -set_property -dict [list CONFIG.SUBSYSTEM_VENDOR_ID {0x11D4}] $axi_pcie_x4 -set_property -dict [list CONFIG.SUBSYSTEM_ID {0x0405}] $axi_pcie_x4 -set_property -dict [list CONFIG.ENABLE_CLASS_CODE {true}] $axi_pcie_x4 -set_property -dict [list CONFIG.CLASS_CODE {0x0D1000}] $axi_pcie_x4 -set_property -dict [list CONFIG.BAR0_ENABLED {true}] $axi_pcie_x4 -set_property -dict [list CONFIG.BAR0_TYPE {Memory}] $axi_pcie_x4 -set_property -dict [list CONFIG.BAR0_SCALE {Gigabytes}] $axi_pcie_x4 -set_property -dict [list CONFIG.BAR0_SIZE {1}] $axi_pcie_x4 -set_property -dict [list CONFIG.NUM_MSI_REQ {1}] $axi_pcie_x4 -set_property -dict [list CONFIG.PCIEBAR2AXIBAR_0 {0x40000000}] $axi_pcie_x4 -set_property -dict [list CONFIG.AXIBAR2PCIEBAR_0 {0x00000000}] $axi_pcie_x4 +ad_ip_instance axi_pcie axi_pcie_x4 +ad_ip_parameter axi_pcie_x4 CONFIG.NO_OF_LANES X4 +ad_ip_parameter axi_pcie_x4 CONFIG.MAX_LINK_SPEED 5.0_GT/s +ad_ip_parameter axi_pcie_x4 CONFIG.VENDOR_ID 0x11D4 +ad_ip_parameter axi_pcie_x4 CONFIG.DEVICE_ID 0x9361 +ad_ip_parameter axi_pcie_x4 CONFIG.SUBSYSTEM_VENDOR_ID 0x11D4 +ad_ip_parameter axi_pcie_x4 CONFIG.SUBSYSTEM_ID 0x0405 +ad_ip_parameter axi_pcie_x4 CONFIG.ENABLE_CLASS_CODE true +ad_ip_parameter axi_pcie_x4 CONFIG.CLASS_CODE 0x0D1000 +ad_ip_parameter axi_pcie_x4 CONFIG.BAR0_ENABLED true +ad_ip_parameter axi_pcie_x4 CONFIG.BAR0_TYPE Memory +ad_ip_parameter axi_pcie_x4 CONFIG.BAR0_SCALE Gigabytes +ad_ip_parameter axi_pcie_x4 CONFIG.BAR0_SIZE 1 +ad_ip_parameter axi_pcie_x4 CONFIG.NUM_MSI_REQ 1 +ad_ip_parameter axi_pcie_x4 CONFIG.PCIEBAR2AXIBAR_0 0x40000000 +ad_ip_parameter axi_pcie_x4 CONFIG.AXIBAR2PCIEBAR_0 0x00000000 -set axi_pcie_x4_rstgen [create_bd_cell -type ip -vlnv xilinx.com:ip:proc_sys_reset:5.0 axi_pcie_x4_rstgen] -set_property -dict [list CONFIG.C_EXT_RST_WIDTH {16}] $axi_pcie_x4_rstgen +ad_ip_instance proc_sys_reset axi_pcie_x4_rstgen +ad_ip_parameter axi_pcie_x4_rstgen CONFIG.C_EXT_RST_WIDTH 16 -set axi_pcie_intc [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_intc:4.1 axi_pcie_intc] -set_property -dict [list CONFIG.C_HAS_FAST {0}] $axi_pcie_intc +ad_ip_instance axi_intc axi_pcie_intc +ad_ip_parameter axi_pcie_intc CONFIG.C_HAS_FAST 0 -set pcie_concat_intc [create_bd_cell -type ip -vlnv xilinx.com:ip:xlconcat:2.1 pcie_concat_intc] -set_property -dict [list CONFIG.NUM_PORTS {5}] $pcie_concat_intc +ad_ip_instance xlconcat pcie_concat_intc +ad_ip_parameter pcie_concat_intc CONFIG.NUM_PORTS 5 create_bd_port -dir I -type rst pcie_rstn create_bd_port -dir I -type clk pcie_ref_clk @@ -117,8 +117,8 @@ delete_bd_objs [get_bd_intf_nets -of_objects [find_bd_objs -relation connected_t delete_bd_objs [get_bd_intf_nets -of_objects [find_bd_objs -relation connected_to [get_bd_intf_pins axi_cpu_interconnect/M02_AXI]]] delete_bd_objs [get_bd_intf_nets -of_objects [find_bd_objs -relation connected_to [get_bd_intf_pins axi_cpu_interconnect/M03_AXI]]] -set_property CONFIG.NUM_MI 8 [get_bd_cells axi_cpu_interconnect] -set_property CONFIG.NUM_SI 2 [get_bd_cells axi_cpu_interconnect] +ad_ip_parameter axi_cpu_interconnect CONFIG.NUM_MI 8 +ad_ip_parameter axi_cpu_interconnect CONFIG.NUM_SI 2 ad_connect axi_pcie_x4/axi_ctl_aclk_out axi_cpu_interconnect/M04_ACLK ad_connect pcie_axi_resetn axi_cpu_interconnect/M04_ARESETN @@ -159,10 +159,10 @@ delete_bd_objs [get_bd_intf_nets -of_objects [find_bd_objs -relation connected_t # pci-e slave -set axi_pcie_s_interconnect [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_interconnect:2.1 axi_pcie_s_interconnect] -set_property -dict [list CONFIG.NUM_SI {2}] $axi_pcie_s_interconnect -set_property -dict [list CONFIG.NUM_MI {1}] $axi_pcie_s_interconnect -set_property -dict [list CONFIG.STRATEGY {2} ] $axi_pcie_s_interconnect +ad_ip_instance axi_interconnect axi_pcie_s_interconnect +ad_ip_parameter axi_pcie_s_interconnect CONFIG.NUM_SI 2 +ad_ip_parameter axi_pcie_s_interconnect CONFIG.NUM_MI 1 +ad_ip_parameter axi_pcie_s_interconnect CONFIG.STRATEGY 2 ad_connect pcie_axi_clk axi_pcie_s_interconnect/ACLK ad_connect pcie_axi_clk axi_pcie_s_interconnect/M00_ACLK @@ -178,9 +178,9 @@ ad_connect axi_pcie_s_interconnect/M00_AXI axi_pcie_x4/S_AXI # hps7 slave -set_property CONFIG.PCW_USE_S_AXI_HP0 {0} [get_bd_cells sys_ps7] -set_property CONFIG.PCW_USE_S_AXI_HP1 {0} [get_bd_cells sys_ps7] -set_property CONFIG.PCW_USE_S_AXI_HP2 {0} [get_bd_cells sys_ps7] +ad_ip_parameter sys_ps7 CONFIG.PCW_USE_S_AXI_HP0 0 +ad_ip_parameter sys_ps7 CONFIG.PCW_USE_S_AXI_HP1 0 +ad_ip_parameter sys_ps7 CONFIG.PCW_USE_S_AXI_HP2 0 # reassign addresses diff --git a/projects/pzsdr2/common/ccusb_bd.tcl b/projects/pzsdr2/common/ccusb_bd.tcl index c656a53dd..b95213548 100644 --- a/projects/pzsdr2/common/ccusb_bd.tcl +++ b/projects/pzsdr2/common/ccusb_bd.tcl @@ -18,18 +18,18 @@ create_bd_port -dir O slwr_n create_bd_port -dir O pktend_n create_bd_port -dir O epswitch_n -set axi_uart [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_uartlite:2.0 axi_uart] -set_property -dict [list CONFIG.C_BAUDRATE {115200}] $axi_uart +ad_ip_instance axi_uartlite axi_uart +ad_ip_parameter axi_uart CONFIG.C_BAUDRATE 115200 -set axi_usb_fx3 [create_bd_cell -type ip -vlnv analog.com:user:axi_usb_fx3:1.0 axi_usb_fx3] +ad_ip_instance axi_usb_fx3 axi_usb_fx3 -set axi_usb_fx3_dma [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_dma:7.1 axi_usb_fx3_dma] -set_property -dict [list CONFIG.c_sg_include_stscntrl_strm {0}] $axi_usb_fx3_dma -set_property -dict [list CONFIG.c_mm2s_burst_size {256}] $axi_usb_fx3_dma -set_property -dict [list CONFIG.c_s2mm_burst_size {256}] $axi_usb_fx3_dma -set_property -dict [list CONFIG.c_sg_length_width {16}] $axi_usb_fx3_dma +ad_ip_instance axi_dma axi_usb_fx3_dma +ad_ip_parameter axi_usb_fx3_dma CONFIG.c_sg_include_stscntrl_strm 0 +ad_ip_parameter axi_usb_fx3_dma CONFIG.c_mm2s_burst_size 256 +ad_ip_parameter axi_usb_fx3_dma CONFIG.c_s2mm_burst_size 256 +ad_ip_parameter axi_usb_fx3_dma CONFIG.c_sg_length_width 16 -set usb_fx3_rx_axis_fifo [ create_bd_cell -type ip -vlnv xilinx.com:ip:axis_data_fifo:1.1 usb_fx3_rx_axis_fifo ] +ad_ip_instance axis_data_fifo usb_fx3_rx_axis_fifo ad_connect axi_usb_fx3/s_axis axi_usb_fx3_dma/M_AXIS_MM2S diff --git a/projects/pzsdr2/common/pzsdr2_bd.tcl b/projects/pzsdr2/common/pzsdr2_bd.tcl index f265bcfb6..3495a6a83 100644 --- a/projects/pzsdr2/common/pzsdr2_bd.tcl +++ b/projects/pzsdr2/common/pzsdr2_bd.tcl @@ -54,74 +54,74 @@ create_bd_port -dir I -type intr ps_intr_15 # instance: sys_ps7 -set sys_ps7 [create_bd_cell -type ip -vlnv xilinx.com:ip:processing_system7:5.5 sys_ps7] -set_property -dict [list CONFIG.PCW_PRESET_BANK0_VOLTAGE {LVCMOS 1.8V}] $sys_ps7 -set_property -dict [list CONFIG.PCW_PRESET_BANK1_VOLTAGE {LVCMOS 1.8V}] $sys_ps7 -set_property -dict [list CONFIG.PCW_PACKAGE_NAME {fbg676}] $sys_ps7 -set_property -dict [list CONFIG.PCW_GPIO_MIO_GPIO_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET0_PERIPHERAL_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET0_ENET0_IO {MIO 16 .. 27}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET0_GRP_MDIO_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET1_PERIPHERAL_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET_RESET_SELECT {Separate reset pins}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET0_RESET_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET0_RESET_IO {MIO 8}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET1_RESET_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_ENET1_RESET_IO {MIO 51}] $sys_ps7 -set_property -dict [list CONFIG.PCW_SD0_PERIPHERAL_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_SD0_GRP_CD_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_SD0_GRP_CD_IO {MIO 50}] $sys_ps7 -set_property -dict [list CONFIG.PCW_SDIO_PERIPHERAL_FREQMHZ {50}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UART1_PERIPHERAL_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_USB0_PERIPHERAL_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_USB0_RESET_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_USB0_RESET_IO {MIO 7}] $sys_ps7 -set_property -dict [list CONFIG.PCW_QSPI_PERIPHERAL_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_PARTNO {MT41K256M16 RE-125}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_BUS_WIDTH {32 Bit}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_USE_INTERNAL_VREF {0}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_TRAIN_WRITE_LEVEL {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_TRAIN_READ_GATE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_TRAIN_DATA_EYE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_DQS_TO_CLK_DELAY_0 {-0.053}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_DQS_TO_CLK_DELAY_1 {-0.059}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_DQS_TO_CLK_DELAY_2 {0.065}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_DQS_TO_CLK_DELAY_3 {0.066}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_BOARD_DELAY0 {0.264}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_BOARD_DELAY1 {0.265}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_BOARD_DELAY2 {0.330}] $sys_ps7 -set_property -dict [list CONFIG.PCW_UIPARAM_DDR_BOARD_DELAY3 {0.330}] $sys_ps7 -set_property -dict [list CONFIG.PCW_TTC0_PERIPHERAL_ENABLE {0}] $sys_ps7 -set_property -dict [list CONFIG.PCW_EN_CLK1_PORT {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_EN_RST1_PORT {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_EN_CLK2_PORT {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_EN_RST2_PORT {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_FPGA0_PERIPHERAL_FREQMHZ {100.0}] $sys_ps7 -set_property -dict [list CONFIG.PCW_FPGA1_PERIPHERAL_FREQMHZ {200.0}] $sys_ps7 -set_property -dict [list CONFIG.PCW_FPGA2_PERIPHERAL_FREQMHZ {200.0}] $sys_ps7 -set_property -dict [list CONFIG.PCW_USE_FABRIC_INTERRUPT {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_IRQ_F2P_INTR {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_GPIO_EMIO_GPIO_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_GPIO_EMIO_GPIO_IO {64}] $sys_ps7 -set_property -dict [list CONFIG.PCW_IRQ_F2P_MODE {REVERSE}] $sys_ps7 -set_property -dict [list CONFIG.PCW_SPI0_PERIPHERAL_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_SPI0_SPI0_IO {EMIO}] $sys_ps7 -set_property -dict [list CONFIG.PCW_SPI1_PERIPHERAL_ENABLE {1}] $sys_ps7 -set_property -dict [list CONFIG.PCW_SPI1_SPI1_IO {EMIO}] $sys_ps7 +ad_ip_instance processing_system7 sys_ps7 +ad_ip_parameter sys_ps7 CONFIG.PCW_PRESET_BANK0_VOLTAGE "LVCMOS 1.8V" +ad_ip_parameter sys_ps7 CONFIG.PCW_PRESET_BANK1_VOLTAGE "LVCMOS 1.8V" +ad_ip_parameter sys_ps7 CONFIG.PCW_PACKAGE_NAME fbg676 +ad_ip_parameter sys_ps7 CONFIG.PCW_GPIO_MIO_GPIO_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET0_PERIPHERAL_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET0_ENET0_IO "MIO 16 .. 27" +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET0_GRP_MDIO_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET1_PERIPHERAL_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET_RESET_SELECT "Separate reset pins" +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET0_RESET_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET0_RESET_IO "MIO 8" +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET1_RESET_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_ENET1_RESET_IO "MIO 51" +ad_ip_parameter sys_ps7 CONFIG.PCW_SD0_PERIPHERAL_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_SD0_GRP_CD_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_SD0_GRP_CD_IO "MIO 50" +ad_ip_parameter sys_ps7 CONFIG.PCW_SDIO_PERIPHERAL_FREQMHZ 50 +ad_ip_parameter sys_ps7 CONFIG.PCW_UART1_PERIPHERAL_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_USB0_PERIPHERAL_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_USB0_RESET_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_USB0_RESET_IO "MIO 7" +ad_ip_parameter sys_ps7 CONFIG.PCW_QSPI_PERIPHERAL_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_PARTNO "MT41K256M16 RE-125" +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_BUS_WIDTH "32 Bit" +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_USE_INTERNAL_VREF 0 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_TRAIN_WRITE_LEVEL 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_TRAIN_READ_GATE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_TRAIN_DATA_EYE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_DQS_TO_CLK_DELAY_0 -0.053 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_DQS_TO_CLK_DELAY_1 -0.059 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_DQS_TO_CLK_DELAY_2 0.065 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_DQS_TO_CLK_DELAY_3 0.066 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_BOARD_DELAY0 0.264 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_BOARD_DELAY1 0.265 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_BOARD_DELAY2 0.330 +ad_ip_parameter sys_ps7 CONFIG.PCW_UIPARAM_DDR_BOARD_DELAY3 0.330 +ad_ip_parameter sys_ps7 CONFIG.PCW_TTC0_PERIPHERAL_ENABLE 0 +ad_ip_parameter sys_ps7 CONFIG.PCW_EN_CLK1_PORT 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_EN_RST1_PORT 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_EN_CLK2_PORT 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_EN_RST2_PORT 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_FPGA0_PERIPHERAL_FREQMHZ 100.0 +ad_ip_parameter sys_ps7 CONFIG.PCW_FPGA1_PERIPHERAL_FREQMHZ 200.0 +ad_ip_parameter sys_ps7 CONFIG.PCW_FPGA2_PERIPHERAL_FREQMHZ 200.0 +ad_ip_parameter sys_ps7 CONFIG.PCW_USE_FABRIC_INTERRUPT 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_IRQ_F2P_INTR 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_GPIO_EMIO_GPIO_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_GPIO_EMIO_GPIO_IO 64 +ad_ip_parameter sys_ps7 CONFIG.PCW_IRQ_F2P_MODE REVERSE +ad_ip_parameter sys_ps7 CONFIG.PCW_SPI0_PERIPHERAL_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_SPI0_SPI0_IO EMIO +ad_ip_parameter sys_ps7 CONFIG.PCW_SPI1_PERIPHERAL_ENABLE 1 +ad_ip_parameter sys_ps7 CONFIG.PCW_SPI1_SPI1_IO EMIO -set axi_iic_main [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_iic:2.0 axi_iic_main] -set_property -dict [list CONFIG.USE_BOARD_FLOW {true}] $axi_iic_main -set_property -dict [list CONFIG.IIC_BOARD_INTERFACE {Custom}] $axi_iic_main +ad_ip_instance axi_iic axi_iic_main +ad_ip_parameter axi_iic_main CONFIG.USE_BOARD_FLOW true +ad_ip_parameter axi_iic_main CONFIG.IIC_BOARD_INTERFACE Custom -set sys_concat_intc [create_bd_cell -type ip -vlnv xilinx.com:ip:xlconcat:2.1 sys_concat_intc] -set_property -dict [list CONFIG.NUM_PORTS {16}] $sys_concat_intc +ad_ip_instance xlconcat sys_concat_intc +ad_ip_parameter sys_concat_intc CONFIG.NUM_PORTS 16 -set sys_rstgen [create_bd_cell -type ip -vlnv xilinx.com:ip:proc_sys_reset:5.0 sys_rstgen] -set_property -dict [list CONFIG.C_EXT_RST_WIDTH {1}] $sys_rstgen +ad_ip_instance proc_sys_reset sys_rstgen +ad_ip_parameter sys_rstgen CONFIG.C_EXT_RST_WIDTH 1 -set sys_logic_inv [create_bd_cell -type ip -vlnv xilinx.com:ip:util_vector_logic:2.0 sys_logic_inv] -set_property -dict [list CONFIG.C_SIZE {1}] $sys_logic_inv -set_property -dict [list CONFIG.C_OPERATION {not}] $sys_logic_inv +ad_ip_instance util_vector_logic sys_logic_inv +ad_ip_parameter sys_logic_inv CONFIG.C_SIZE 1 +ad_ip_parameter sys_logic_inv CONFIG.C_OPERATION not # system reset/clock definitions @@ -201,60 +201,60 @@ create_bd_port -dir O tdd_sync_t # ad9361 core -set axi_ad9361 [create_bd_cell -type ip -vlnv analog.com:user:axi_ad9361:1.0 axi_ad9361] -set_property -dict [list CONFIG.ID {0}] $axi_ad9361 -set_property -dict [list CONFIG.DAC_IODELAY_ENABLE {1}] $axi_ad9361 +ad_ip_instance axi_ad9361 axi_ad9361 +ad_ip_parameter axi_ad9361 CONFIG.ID 0 +ad_ip_parameter axi_ad9361 CONFIG.DAC_IODELAY_ENABLE 1 -set axi_ad9361_dac_dma [create_bd_cell -type ip -vlnv analog.com:user:axi_dmac:1.0 axi_ad9361_dac_dma] -set_property -dict [list CONFIG.DMA_TYPE_SRC {0}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.DMA_TYPE_DEST {2}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.CYCLIC {1}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.AXI_SLICE_SRC {0}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.AXI_SLICE_DEST {1}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.DMA_2D_TRANSFER {0}] $axi_ad9361_dac_dma -set_property -dict [list CONFIG.DMA_DATA_WIDTH_DEST {64}] $axi_ad9361_dac_dma +ad_ip_instance axi_dmac axi_ad9361_dac_dma +ad_ip_parameter axi_ad9361_dac_dma CONFIG.DMA_TYPE_SRC 0 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.DMA_TYPE_DEST 2 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.CYCLIC 1 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.AXI_SLICE_SRC 0 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.AXI_SLICE_DEST 1 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.DMA_2D_TRANSFER 0 +ad_ip_parameter axi_ad9361_dac_dma CONFIG.DMA_DATA_WIDTH_DEST 64 -set util_ad9361_dac_upack [create_bd_cell -type ip -vlnv analog.com:user:util_upack:1.0 util_ad9361_dac_upack] -set_property -dict [list CONFIG.NUM_OF_CHANNELS {4}] $util_ad9361_dac_upack -set_property -dict [list CONFIG.CHANNEL_DATA_WIDTH {16}] $util_ad9361_dac_upack +ad_ip_instance util_upack util_ad9361_dac_upack +ad_ip_parameter util_ad9361_dac_upack CONFIG.NUM_OF_CHANNELS 4 +ad_ip_parameter util_ad9361_dac_upack CONFIG.CHANNEL_DATA_WIDTH 16 -set axi_ad9361_adc_dma [create_bd_cell -type ip -vlnv analog.com:user:axi_dmac:1.0 axi_ad9361_adc_dma] -set_property -dict [list CONFIG.DMA_TYPE_SRC {2}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.DMA_TYPE_DEST {0}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.CYCLIC {0}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.SYNC_TRANSFER_START {1}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.AXI_SLICE_SRC {0}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.AXI_SLICE_DEST {0}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.DMA_2D_TRANSFER {0}] $axi_ad9361_adc_dma -set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {64}] $axi_ad9361_adc_dma +ad_ip_instance axi_dmac axi_ad9361_adc_dma +ad_ip_parameter axi_ad9361_adc_dma CONFIG.DMA_TYPE_SRC 2 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.DMA_TYPE_DEST 0 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.CYCLIC 0 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.SYNC_TRANSFER_START 1 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.AXI_SLICE_SRC 0 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.AXI_SLICE_DEST 0 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.DMA_2D_TRANSFER 0 +ad_ip_parameter axi_ad9361_adc_dma CONFIG.DMA_DATA_WIDTH_SRC 64 -set util_ad9361_adc_pack [create_bd_cell -type ip -vlnv analog.com:user:util_cpack:1.0 util_ad9361_adc_pack] -set_property -dict [list CONFIG.NUM_OF_CHANNELS {4}] $util_ad9361_adc_pack -set_property -dict [list CONFIG.CHANNEL_DATA_WIDTH {16}] $util_ad9361_adc_pack +ad_ip_instance util_cpack util_ad9361_adc_pack +ad_ip_parameter util_ad9361_adc_pack CONFIG.NUM_OF_CHANNELS 4 +ad_ip_parameter util_ad9361_adc_pack CONFIG.CHANNEL_DATA_WIDTH 16 -set util_ad9361_adc_fifo [create_bd_cell -type ip -vlnv analog.com:user:util_wfifo:1.0 util_ad9361_adc_fifo] -set_property -dict [list CONFIG.NUM_OF_CHANNELS {4}] $util_ad9361_adc_fifo -set_property -dict [list CONFIG.DIN_ADDRESS_WIDTH {4}] $util_ad9361_adc_fifo -set_property -dict [list CONFIG.DIN_DATA_WIDTH {16}] $util_ad9361_adc_fifo -set_property -dict [list CONFIG.DOUT_DATA_WIDTH {16}] $util_ad9361_adc_fifo +ad_ip_instance util_wfifo util_ad9361_adc_fifo +ad_ip_parameter util_ad9361_adc_fifo CONFIG.NUM_OF_CHANNELS 4 +ad_ip_parameter util_ad9361_adc_fifo CONFIG.DIN_ADDRESS_WIDTH 4 +ad_ip_parameter util_ad9361_adc_fifo CONFIG.DIN_DATA_WIDTH 16 +ad_ip_parameter util_ad9361_adc_fifo CONFIG.DOUT_DATA_WIDTH 16 -set util_ad9361_tdd_sync [create_bd_cell -type ip -vlnv analog.com:user:util_tdd_sync:1.0 util_ad9361_tdd_sync] -set_property -dict [list CONFIG.TDD_SYNC_PERIOD {10000000}] $util_ad9361_tdd_sync +ad_ip_instance util_tdd_sync util_ad9361_tdd_sync +ad_ip_parameter util_ad9361_tdd_sync CONFIG.TDD_SYNC_PERIOD 10000000 -set clkdiv [ create_bd_cell -type ip -vlnv analog.com:user:util_clkdiv:1.0 clkdiv ] +ad_ip_instance util_clkdiv clkdiv -set clkdiv_reset [create_bd_cell -type ip -vlnv xilinx.com:ip:proc_sys_reset:5.0 clkdiv_reset] +ad_ip_instance proc_sys_reset clkdiv_reset -set dac_fifo [create_bd_cell -type ip -vlnv analog.com:user:util_rfifo:1.0 dac_fifo] -set_property -dict [list CONFIG.DIN_DATA_WIDTH {16}] $dac_fifo -set_property -dict [list CONFIG.DOUT_DATA_WIDTH {16}] $dac_fifo -set_property -dict [list CONFIG.DIN_ADDRESS_WIDTH {4}] $dac_fifo +ad_ip_instance util_rfifo dac_fifo +ad_ip_parameter dac_fifo CONFIG.DIN_DATA_WIDTH 16 +ad_ip_parameter dac_fifo CONFIG.DOUT_DATA_WIDTH 16 +ad_ip_parameter dac_fifo CONFIG.DIN_ADDRESS_WIDTH 4 -set clkdiv_sel_logic [create_bd_cell -type ip -vlnv xilinx.com:ip:util_reduced_logic:2.0 clkdiv_sel_logic] -set_property -dict [list CONFIG.C_SIZE {2}] $clkdiv_sel_logic +ad_ip_instance util_reduced_logic clkdiv_sel_logic +ad_ip_parameter clkdiv_sel_logic CONFIG.C_SIZE 2 -set concat_logic [create_bd_cell -type ip -vlnv xilinx.com:ip:xlconcat:2.1 concat_logic] -set_property -dict [list CONFIG.NUM_PORTS {2}] $concat_logic +ad_ip_instance xlconcat concat_logic +ad_ip_parameter concat_logic CONFIG.NUM_PORTS 2 # connections