common_bd: Update the common block designs to the new IRQ path
Avoid the use of xil_concat module by using the ad_interrupts.main
Istvan Csomortani
parent
b254380338
commit
a870603db5
|
|
@ -20,12 +20,6 @@ set iic_main [create_bd_intf_port -mode Master -vlnv xilinx.com:interface
|
|||
set uart_sin [create_bd_port -dir I uart_sin]
|
||||
set uart_sout [create_bd_port -dir O uart_sout]
|
||||
|
||||
set unc_int0 [create_bd_port -dir I unc_int0]
|
||||
set unc_int1 [create_bd_port -dir I unc_int1]
|
||||
set unc_int2 [create_bd_port -dir I unc_int2]
|
||||
set unc_int3 [create_bd_port -dir I unc_int3]
|
||||
set unc_int4 [create_bd_port -dir I unc_int4]
|
||||
|
||||
set hdmi_out_clk [create_bd_port -dir O hdmi_out_clk]
|
||||
set hdmi_hsync [create_bd_port -dir O hdmi_hsync]
|
||||
set hdmi_vsync [create_bd_port -dir O hdmi_vsync]
|
||||
|
|
@ -38,6 +32,21 @@ set spdif [create_bd_port -dir O spdif]
|
|||
|
||||
set_property -dict [list CONFIG.POLARITY {ACTIVE_HIGH}] $sys_rst
|
||||
|
||||
# interrupts
|
||||
|
||||
set timer_irq [create_bd_port -dir O timer_irq]
|
||||
set eth_irq [create_bd_port -dir O eth_irq]
|
||||
set eth_dma_mm2s_irq [create_bd_port -dir O eth_dma_mm2s_irq]
|
||||
set eth_dma_s2mm_irq [create_bd_port -dir O eth_dma_s2mm_irq]
|
||||
set uart_irq [create_bd_port -dir O uart_irq]
|
||||
set gpio_lcd_irq [create_bd_port -dir O gpio_lcd_irq]
|
||||
set gpio_sw_irq [create_bd_port -dir O gpio_sw_irq]
|
||||
set spdif_dma_irq [create_bd_port -dir O spdif_dma_irq]
|
||||
set iic_irq [create_bd_port -dir O iic_irq]
|
||||
set hdmi_dma_irq [create_bd_port -dir O hdmi_dma_irq]
|
||||
|
||||
set mb_axi_intr [create_bd_port -dir I -from 31 -to 0 -type intr mb_axi_intr]
|
||||
|
||||
# instance: microblaze - processor
|
||||
|
||||
set sys_mb [create_bd_cell -type ip -vlnv xilinx.com:ip:microblaze:9.3 sys_mb]
|
||||
|
|
@ -146,13 +155,6 @@ set_property -dict [list CONFIG.C_INTERRUPT_PRESENT {1}] $axi_gpio_sw_led
|
|||
set axi_intc [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_intc:4.1 axi_intc]
|
||||
set_property -dict [list CONFIG.C_HAS_FAST {0}] $axi_intc
|
||||
|
||||
set sys_concat_aux_intc [create_bd_cell -type ip -vlnv xilinx.com:ip:xlconcat:2.1 sys_concat_aux_intc]
|
||||
set_property -dict [list CONFIG.NUM_PORTS {9}] $sys_concat_aux_intc
|
||||
set_property -dict [list CONFIG.IN9_WIDTH {5}] $sys_concat_aux_intc
|
||||
|
||||
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 {5}] $sys_concat_intc
|
||||
|
||||
# hdmi peripherals
|
||||
|
||||
set axi_hdmi_clkgen [create_bd_cell -type ip -vlnv analog.com:user:axi_clkgen:1.0 axi_hdmi_clkgen]
|
||||
|
|
@ -206,8 +208,8 @@ connect_bd_intf_net -intf_net sys_mb_ilmb [get_bd_intf_pins sys_mb/ILMB] [get_bd
|
|||
|
||||
connect_bd_intf_net -intf_net sys_mb_debug_intf [get_bd_intf_pins sys_mb_debug/MBDEBUG_0] [get_bd_intf_pins sys_mb/DEBUG]
|
||||
connect_bd_intf_net -intf_net sys_mb_interrupt [get_bd_intf_pins axi_intc/interrupt] [get_bd_intf_pins sys_mb/INTERRUPT]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr [get_bd_pins sys_concat_aux_intc/dout] [get_bd_pins axi_intc/intr]
|
||||
connect_bd_net -net sys_concat_intc_intr [get_bd_pins sys_concat_intc/dout] [get_bd_pins sys_concat_aux_intc/In8]
|
||||
connect_bd_net -net sys_concat_intr [get_bd_ports mb_axi_intr] [get_bd_pins axi_intc/intr]
|
||||
set_property -dict [list CONFIG.PortWidth {32}] [get_bd_ports mb_axi_intr]
|
||||
|
||||
# defaults (peripherals)
|
||||
|
||||
|
|
@ -340,19 +342,16 @@ connect_bd_intf_net -intf_net axi_ethernet_dma_rxs [get_bd_intf_pins axi_etherne
|
|||
|
||||
# defaults (interrupts)
|
||||
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_00 [get_bd_pins sys_concat_aux_intc/In0] [get_bd_pins axi_timer/interrupt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_01 [get_bd_pins sys_concat_aux_intc/In1] [get_bd_pins axi_ethernet/interrupt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_02 [get_bd_pins sys_concat_aux_intc/In2] [get_bd_pins axi_ethernet_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_03 [get_bd_pins sys_concat_aux_intc/In3] [get_bd_pins axi_ethernet_dma/s2mm_introut]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_04 [get_bd_pins sys_concat_aux_intc/In4] [get_bd_pins axi_uart/interrupt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_05 [get_bd_pins sys_concat_aux_intc/In5] [get_bd_pins axi_gpio_lcd/ip2intc_irpt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_06 [get_bd_pins sys_concat_aux_intc/In6] [get_bd_pins axi_gpio_sw_led/ip2intc_irpt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_07 [get_bd_pins sys_concat_aux_intc/In7] [get_bd_pins axi_spdif_tx_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_concat_intc_din_0 [get_bd_pins sys_concat_intc/In0] [get_bd_pins axi_hdmi_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_concat_intc_din_1 [get_bd_pins sys_concat_intc/In1] [get_bd_pins axi_iic_main/iic2intc_irpt]
|
||||
connect_bd_net -net sys_concat_intc_din_2 [get_bd_pins sys_concat_intc/In2] [get_bd_ports unc_int2]
|
||||
connect_bd_net -net sys_concat_intc_din_3 [get_bd_pins sys_concat_intc/In3] [get_bd_ports unc_int3]
|
||||
connect_bd_net -net sys_concat_intc_din_4 [get_bd_pins sys_concat_intc/In4] [get_bd_ports unc_int4]
|
||||
connect_bd_net -net sys_base_intr_00 [get_bd_ports timer_irq] [get_bd_pins axi_timer/interrupt]
|
||||
connect_bd_net -net sys_base_intr_01 [get_bd_ports eth_irq] [get_bd_pins axi_ethernet/interrupt]
|
||||
connect_bd_net -net sys_base_intr_02 [get_bd_ports eth_dma_mm2s_irq] [get_bd_pins axi_ethernet_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_base_intr_03 [get_bd_ports eth_dma_s2mm_irq] [get_bd_pins axi_ethernet_dma/s2mm_introut]
|
||||
connect_bd_net -net sys_base_intr_04 [get_bd_ports uart_irq] [get_bd_pins axi_uart/interrupt]
|
||||
connect_bd_net -net sys_base_intr_05 [get_bd_ports gpio_lcd_irq] [get_bd_pins axi_gpio_lcd/ip2intc_irpt]
|
||||
connect_bd_net -net sys_base_intr_06 [get_bd_ports gpio_sw_irq] [get_bd_pins axi_gpio_sw_led/ip2intc_irpt]
|
||||
connect_bd_net -net sys_base_intr_07 [get_bd_ports spdif_dma_irq] [get_bd_pins axi_spdif_tx_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_base_intr_08 [get_bd_ports iic_irq] [get_bd_pins axi_hdmi_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_base_intr_09 [get_bd_ports hdmi_dma_irq] [get_bd_pins axi_iic_main/iic2intc_irpt]
|
||||
|
||||
# defaults (external interface)
|
||||
|
||||
|
|
|
|||
|
|
@ -24,12 +24,6 @@ set iic_main [create_bd_intf_port -mode Master -vlnv xilinx.com:interface
|
|||
set uart_sin [create_bd_port -dir I uart_sin]
|
||||
set uart_sout [create_bd_port -dir O uart_sout]
|
||||
|
||||
set unc_int0 [create_bd_port -dir I unc_int0]
|
||||
set unc_int1 [create_bd_port -dir I unc_int1]
|
||||
set unc_int2 [create_bd_port -dir I unc_int2]
|
||||
set unc_int3 [create_bd_port -dir I unc_int3]
|
||||
set unc_int4 [create_bd_port -dir I unc_int4]
|
||||
|
||||
set hdmi_out_clk [create_bd_port -dir O hdmi_out_clk]
|
||||
set hdmi_hsync [create_bd_port -dir O hdmi_hsync]
|
||||
set hdmi_vsync [create_bd_port -dir O hdmi_vsync]
|
||||
|
|
@ -40,6 +34,19 @@ set hdmi_data [create_bd_port -dir O -from 15 -to 0 hdmi_data]
|
|||
|
||||
set spdif [create_bd_port -dir O spdif]
|
||||
|
||||
# interrupts
|
||||
|
||||
set timer_irq [create_bd_port -dir O timer_irq]
|
||||
set eth_irq [create_bd_port -dir O eth_irq]
|
||||
set uart_irq [create_bd_port -dir O uart_irq]
|
||||
set gpio_lcd_irq [create_bd_port -dir O gpio_lcd_irq]
|
||||
set gpio_sw_irq [create_bd_port -dir O gpio_sw_irq]
|
||||
set spdif_dma_irq [create_bd_port -dir O spdif_dma_irq]
|
||||
set iic_irq [create_bd_port -dir O iic_irq]
|
||||
set hdmi_dma_irq [create_bd_port -dir O hdmi_dma_irq]
|
||||
|
||||
set mb_axi_intr [create_bd_port -dir I -from 31 -to 0 -type intr mb_axi_intr]
|
||||
|
||||
set_property -dict [list CONFIG.POLARITY {ACTIVE_HIGH}] $sys_rst
|
||||
|
||||
# instance: microblaze - processor
|
||||
|
|
@ -152,13 +159,6 @@ set_property -dict [list CONFIG.C_INTERRUPT_PRESENT {1}] $axi_gpio_sw_led
|
|||
set axi_intc [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_intc:4.1 axi_intc]
|
||||
set_property -dict [list CONFIG.C_HAS_FAST {0}] $axi_intc
|
||||
|
||||
set sys_concat_aux_intc [create_bd_cell -type ip -vlnv xilinx.com:ip:xlconcat:2.1 sys_concat_aux_intc]
|
||||
set_property -dict [list CONFIG.NUM_PORTS {9}] $sys_concat_aux_intc
|
||||
set_property -dict [list CONFIG.IN9_WIDTH {5}] $sys_concat_aux_intc
|
||||
|
||||
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 {5}] $sys_concat_intc
|
||||
|
||||
# hdmi peripherals
|
||||
|
||||
set axi_hdmi_clkgen [create_bd_cell -type ip -vlnv analog.com:user:axi_clkgen:1.0 axi_hdmi_clkgen]
|
||||
|
|
@ -212,8 +212,8 @@ connect_bd_intf_net -intf_net sys_mb_ilmb [get_bd_intf_pins sys_mb/ILMB] [get_bd
|
|||
|
||||
connect_bd_intf_net -intf_net sys_mb_debug_intf [get_bd_intf_pins sys_mb_debug/MBDEBUG_0] [get_bd_intf_pins sys_mb/DEBUG]
|
||||
connect_bd_intf_net -intf_net sys_mb_interrupt [get_bd_intf_pins axi_intc/interrupt] [get_bd_intf_pins sys_mb/INTERRUPT]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr [get_bd_pins sys_concat_aux_intc/dout] [get_bd_pins axi_intc/intr]
|
||||
connect_bd_net -net sys_concat_intc_intr [get_bd_pins sys_concat_intc/dout] [get_bd_pins sys_concat_aux_intc/In8]
|
||||
connect_bd_net -net sys_concat_intr [get_bd_ports mb_axi_intr] [get_bd_pins axi_intc/intr]
|
||||
set_property -dict [list CONFIG.PortWidth {32}] [get_bd_ports mb_axi_intr]
|
||||
|
||||
# defaults (peripherals)
|
||||
|
||||
|
|
@ -319,19 +319,14 @@ connect_bd_net -net sys_100m_clk [get_bd_pins axi_mem_interconnect/S07_ACLK] $sy
|
|||
|
||||
# defaults (interrupts)
|
||||
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_00 [get_bd_pins sys_concat_aux_intc/In0] [get_bd_pins axi_timer/interrupt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_01 [get_bd_pins sys_concat_aux_intc/In1] [get_bd_pins axi_ethernet/ip2intc_irpt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_02 [get_bd_pins sys_concat_aux_intc/In2] [get_bd_ports unc_int0]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_03 [get_bd_pins sys_concat_aux_intc/In3] [get_bd_ports unc_int1]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_04 [get_bd_pins sys_concat_aux_intc/In4] [get_bd_pins axi_uart/interrupt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_05 [get_bd_pins sys_concat_aux_intc/In5] [get_bd_pins axi_gpio_lcd/ip2intc_irpt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_06 [get_bd_pins sys_concat_aux_intc/In6] [get_bd_pins axi_gpio_sw_led/ip2intc_irpt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_07 [get_bd_pins sys_concat_aux_intc/In7] [get_bd_pins axi_spdif_tx_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_concat_intc_din_0 [get_bd_pins sys_concat_intc/In0] [get_bd_pins axi_hdmi_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_concat_intc_din_1 [get_bd_pins sys_concat_intc/In1] [get_bd_pins axi_iic_main/iic2intc_irpt]
|
||||
connect_bd_net -net sys_concat_intc_din_2 [get_bd_pins sys_concat_intc/In2] [get_bd_ports unc_int2]
|
||||
connect_bd_net -net sys_concat_intc_din_3 [get_bd_pins sys_concat_intc/In3] [get_bd_ports unc_int3]
|
||||
connect_bd_net -net sys_concat_intc_din_4 [get_bd_pins sys_concat_intc/In4] [get_bd_ports unc_int4]
|
||||
connect_bd_net -net sys_base_intr_00 [get_bd_ports timer_irq] [get_bd_pins axi_timer/interrupt]
|
||||
connect_bd_net -net sys_base_intr_01 [get_bd_ports eth_irq] [get_bd_pins axi_ethernet/ip2intc_irpt]
|
||||
connect_bd_net -net sys_base_intr_04 [get_bd_ports uart_irq] [get_bd_pins axi_uart/interrupt]
|
||||
connect_bd_net -net sys_base_intr_05 [get_bd_ports gpio_lcd_irq] [get_bd_pins axi_gpio_lcd/ip2intc_irpt]
|
||||
connect_bd_net -net sys_base_intr_06 [get_bd_ports gpio_sw_irq] [get_bd_pins axi_gpio_sw_led/ip2intc_irpt]
|
||||
connect_bd_net -net sys_base_intr_07 [get_bd_ports spdif_dma_irq] [get_bd_pins axi_spdif_tx_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_base_intr_08 [get_bd_ports iic_irq] [get_bd_pins axi_hdmi_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_base_intr_09 [get_bd_ports hdmi_dma_irq ] [get_bd_pins axi_iic_main/iic2intc_irpt]
|
||||
|
||||
# defaults (external interface)
|
||||
|
||||
|
|
|
|||
|
|
@ -22,16 +22,27 @@ set iic_main [create_bd_intf_port -mode Master -vlnv xilinx.com:interface
|
|||
set uart_sin [create_bd_port -dir I uart_sin]
|
||||
set uart_sout [create_bd_port -dir O uart_sout]
|
||||
|
||||
set unc_int2 [create_bd_port -dir I unc_int2]
|
||||
set unc_int3 [create_bd_port -dir I unc_int3]
|
||||
set unc_int4 [create_bd_port -dir I unc_int4]
|
||||
|
||||
set hdmi_out_clk [create_bd_port -dir O hdmi_out_clk]
|
||||
set hdmi_hsync [create_bd_port -dir O hdmi_hsync]
|
||||
set hdmi_vsync [create_bd_port -dir O hdmi_vsync]
|
||||
set hdmi_data_e [create_bd_port -dir O hdmi_data_e]
|
||||
set hdmi_data [create_bd_port -dir O -from 15 -to 0 hdmi_data]
|
||||
|
||||
# interrupts
|
||||
|
||||
set timer_irq [create_bd_port -dir O timer_irq]
|
||||
set eth_irq [create_bd_port -dir O eth_irq]
|
||||
set eth_dma_mm2s_irq [create_bd_port -dir O eth_dma_mm2s_irq]
|
||||
set eth_dma_s2mm_irq [create_bd_port -dir O eth_dma_s2mm_irq]
|
||||
set uart_irq [create_bd_port -dir O uart_irq]
|
||||
set gpio_lcd_irq [create_bd_port -dir O gpio_lcd_irq]
|
||||
set gpio_sw_irq [create_bd_port -dir O gpio_sw_irq]
|
||||
set spdif_dma_irq [create_bd_port -dir O spdif_dma_irq]
|
||||
set iic_irq [create_bd_port -dir O iic_irq]
|
||||
set hdmi_dma_irq [create_bd_port -dir O hdmi_dma_irq]
|
||||
|
||||
set mb_axi_intr [create_bd_port -dir I -from 31 -to 0 -type intr mb_axi_intr]
|
||||
|
||||
# spdif audio
|
||||
|
||||
set spdif [create_bd_port -dir O spdif]
|
||||
|
|
@ -181,13 +192,6 @@ set_property -dict [list CONFIG.C_INTERRUPT_PRESENT {1}] $axi_gpio_sw_led
|
|||
set axi_intc [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_intc:4.1 axi_intc]
|
||||
set_property -dict [list CONFIG.C_HAS_FAST {0}] $axi_intc
|
||||
|
||||
set sys_concat_aux_intc [create_bd_cell -type ip -vlnv xilinx.com:ip:xlconcat:2.1 sys_concat_aux_intc]
|
||||
set_property -dict [list CONFIG.NUM_PORTS {9}] $sys_concat_aux_intc
|
||||
set_property -dict [list CONFIG.IN8_WIDTH {5}] $sys_concat_aux_intc
|
||||
|
||||
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 {5}] $sys_concat_intc
|
||||
|
||||
# hdmi peripherals
|
||||
|
||||
set axi_hdmi_clkgen [create_bd_cell -type ip -vlnv analog.com:user:axi_clkgen:1.0 axi_hdmi_clkgen]
|
||||
|
|
@ -240,8 +244,8 @@ connect_bd_intf_net -intf_net sys_mb_ilmb [get_bd_intf_pins sys_mb/ILMB] [get_bd
|
|||
|
||||
connect_bd_intf_net -intf_net sys_mb_debug_intf [get_bd_intf_pins sys_mb_debug/MBDEBUG_0] [get_bd_intf_pins sys_mb/DEBUG]
|
||||
connect_bd_intf_net -intf_net sys_mb_interrupt [get_bd_intf_pins axi_intc/interrupt] [get_bd_intf_pins sys_mb/INTERRUPT]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr [get_bd_pins sys_concat_aux_intc/dout] [get_bd_pins axi_intc/intr]
|
||||
connect_bd_net -net sys_concat_intc_intr [get_bd_pins sys_concat_intc/dout] [get_bd_pins sys_concat_aux_intc/In8]
|
||||
connect_bd_net -net sys_concat_intr [get_bd_ports mb_axi_intr] [get_bd_pins axi_intc/intr]
|
||||
set_property -dict [list CONFIG.PortWidth {32}] [get_bd_ports mb_axi_intr]
|
||||
|
||||
# defaults (peripherals)
|
||||
|
||||
|
|
@ -340,7 +344,7 @@ connect_bd_net -net sys_100m_clk [get_bd_pins axi_cpu_interconnect/M00_ACLK] $sy
|
|||
|
||||
# defaults (interconnect - memory)
|
||||
|
||||
connect_bd_intf_net -intf_net axi_mem_aux_interconnect_m00 [get_bd_intf_pins axi_mem_aux_interconnect/M00_AXI] [get_bd_intf_pins axi_ddr_cntrl/C0_DDR4_S_AXI]
|
||||
connect_bd_intf_net -intf_net axi_mem_aux_interconnect_m00 [get_bd_intf_pins axi_mem_aux_interconnect/M00_AXI] [get_bd_intf_pins axi_ddr_cntrl/C0_DDR4_S_AXI]
|
||||
connect_bd_intf_net -intf_net axi_mem_aux_interconnect_s00 [get_bd_intf_pins axi_mem_aux_interconnect/S00_AXI] [get_bd_intf_pins axi_mem_interconnect/M00_AXI]
|
||||
connect_bd_net -net sys_mem_rstn [get_bd_pins axi_mem_aux_interconnect/M00_ARESETN] $sys_mem_resetn_source
|
||||
connect_bd_net -net sys_mem_clk [get_bd_pins axi_mem_aux_interconnect/M00_ACLK] $sys_mem_clk_source
|
||||
|
|
@ -369,19 +373,16 @@ connect_bd_net -net sys_100m_clk [get_bd_pins axi_mem_interconnect/S07_ACLK] $sy
|
|||
|
||||
# defaults (interrupts)
|
||||
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_00 [get_bd_pins sys_concat_aux_intc/In0] [get_bd_pins axi_timer/interrupt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_01 [get_bd_pins sys_concat_aux_intc/In1] [get_bd_pins axi_ethernet/interrupt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_02 [get_bd_pins sys_concat_aux_intc/In2] [get_bd_pins axi_ethernet_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_03 [get_bd_pins sys_concat_aux_intc/In3] [get_bd_pins axi_ethernet_dma/s2mm_introut]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_04 [get_bd_pins sys_concat_aux_intc/In4] [get_bd_pins axi_uart/interrupt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_05 [get_bd_pins sys_concat_aux_intc/In5] [get_bd_pins axi_gpio_lcd/ip2intc_irpt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_06 [get_bd_pins sys_concat_aux_intc/In6] [get_bd_pins axi_gpio_sw_led/ip2intc_irpt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_07 [get_bd_pins sys_concat_aux_intc/In7] [get_bd_pins axi_spdif_tx_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_concat_intc_din_0 [get_bd_pins sys_concat_intc/In0] [get_bd_pins axi_hdmi_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_concat_intc_din_1 [get_bd_pins sys_concat_intc/In1] [get_bd_pins axi_iic_main/iic2intc_irpt]
|
||||
connect_bd_net -net sys_concat_intc_din_2 [get_bd_pins sys_concat_intc/In2] [get_bd_ports unc_int2]
|
||||
connect_bd_net -net sys_concat_intc_din_3 [get_bd_pins sys_concat_intc/In3] [get_bd_ports unc_int3]
|
||||
connect_bd_net -net sys_concat_intc_din_4 [get_bd_pins sys_concat_intc/In4] [get_bd_ports unc_int4]
|
||||
connect_bd_net -net sys_base_intr_00 [get_bd_ports timer_irq] [get_bd_pins axi_timer/interrupt]
|
||||
connect_bd_net -net sys_base_intr_01 [get_bd_ports eth_irq] [get_bd_pins axi_ethernet/interrupt]
|
||||
connect_bd_net -net sys_base_intr_02 [get_bd_ports eth_dma_mm2s_irq] [get_bd_pins axi_ethernet_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_base_intr_03 [get_bd_ports eth_dma_s2mm_irq] [get_bd_pins axi_ethernet_dma/s2mm_introut]
|
||||
connect_bd_net -net sys_base_intr_04 [get_bd_ports uart_irq] [get_bd_pins axi_uart/interrupt]
|
||||
connect_bd_net -net sys_base_intr_05 [get_bd_ports gpio_lcd_irq] [get_bd_pins axi_gpio_lcd/ip2intc_irpt]
|
||||
connect_bd_net -net sys_base_intr_06 [get_bd_ports gpio_sw_irq] [get_bd_pins axi_gpio_sw_led/ip2intc_irpt]
|
||||
connect_bd_net -net sys_base_intr_07 [get_bd_ports spdif_dma_irq] [get_bd_pins axi_spdif_tx_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_base_intr_08 [get_bd_ports iic_irq] [get_bd_pins axi_hdmi_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_base_intr_09 [get_bd_ports hdmi_dma_irq] [get_bd_pins axi_iic_main/iic2intc_irpt]
|
||||
|
||||
# defaults (ddr)
|
||||
|
||||
|
|
@ -392,8 +393,8 @@ connect_bd_net -net sys_rst [get_bd_ports sys_rst] [get_bd_pins
|
|||
|
||||
connect_bd_net -net axi_ddr_cntrl_rst [get_bd_pins axi_ddr_cntrl/c0_ddr4_ui_clk_sync_rst]
|
||||
connect_bd_net -net axi_ddr_cntrl_rst [get_bd_pins sys_rstgen/ext_reset_in]
|
||||
connect_bd_net -net axi_ddr_cntrl_rst [get_bd_pins axi_ethernet_rstgen/ext_reset_in]
|
||||
connect_bd_net -net axi_ddr_cntrl_rst [get_bd_pins axi_ddr_cntrl_rstgen/ext_reset_in]
|
||||
connect_bd_net -net axi_ddr_cntrl_rst [get_bd_pins axi_ethernet_rstgen/ext_reset_in]
|
||||
connect_bd_net -net axi_ddr_cntrl_rst [get_bd_pins axi_ddr_cntrl_rstgen/ext_reset_in]
|
||||
connect_bd_net -net sys_mem_clk [get_bd_pins axi_ddr_cntrl_rstgen/slowest_sync_clk]
|
||||
|
||||
# defaults (ethernet)
|
||||
|
|
@ -409,9 +410,9 @@ connect_bd_intf_net -intf_net axi_ethernet_dma_rxs [get_bd_intf_pins axi_et
|
|||
connect_bd_net -net phy_sd [get_bd_ports phy_sd] [get_bd_pins axi_ethernet/signal_detect]
|
||||
connect_bd_net -net sys_100m_resetn [get_bd_ports phy_rst_n] $sys_100m_resetn_source
|
||||
connect_bd_net -net axi_ethernet_clkgen_125m_clk [get_bd_pins axi_ethernet_clkgen/clk_out1] [get_bd_pins axi_ethernet/clk125m]
|
||||
connect_bd_net -net axi_ethernet_clkgen_312m_clk [get_bd_pins axi_ethernet_clkgen/clk_out2] [get_bd_pins axi_ethernet/clk312]
|
||||
connect_bd_net -net axi_ethernet_clkgen_625m_clk [get_bd_pins axi_ethernet_clkgen/clk_out3] [get_bd_pins axi_ethernet/clk625]
|
||||
connect_bd_net -net axi_ethernet_clkgen_locked [get_bd_pins axi_ethernet_clkgen/locked] [get_bd_pins axi_ethernet/mmcm_locked]
|
||||
connect_bd_net -net axi_ethernet_clkgen_312m_clk [get_bd_pins axi_ethernet_clkgen/clk_out2] [get_bd_pins axi_ethernet/clk312]
|
||||
connect_bd_net -net axi_ethernet_clkgen_625m_clk [get_bd_pins axi_ethernet_clkgen/clk_out3] [get_bd_pins axi_ethernet/clk625]
|
||||
connect_bd_net -net axi_ethernet_clkgen_locked [get_bd_pins axi_ethernet_clkgen/locked] [get_bd_pins axi_ethernet/mmcm_locked]
|
||||
connect_bd_net -net axi_ethernet_rstgen_rst [get_bd_pins axi_ethernet_rstgen/peripheral_reset] [get_bd_pins axi_ethernet/rst_125]
|
||||
connect_bd_net -net axi_ethernet_dma_txd_rstn [get_bd_pins axi_ethernet/axi_txd_arstn] [get_bd_pins axi_ethernet_dma/mm2s_prmry_reset_out_n]
|
||||
connect_bd_net -net axi_ethernet_dma_txc_rstn [get_bd_pins axi_ethernet/axi_txc_arstn] [get_bd_pins axi_ethernet_dma/mm2s_cntrl_reset_out_n]
|
||||
|
|
|
|||
|
|
@ -39,6 +39,21 @@ set spdif [create_bd_port -dir O spdif]
|
|||
|
||||
set_property -dict [list CONFIG.POLARITY {ACTIVE_HIGH}] $sys_rst
|
||||
|
||||
# interrupts
|
||||
|
||||
set timer_irq [create_bd_port -dir O timer_irq]
|
||||
set eth_irq [create_bd_port -dir O eth_irq]
|
||||
set eth_dma_mm2s_irq [create_bd_port -dir O eth_dma_mm2s_irq]
|
||||
set eth_dma_s2mm_irq [create_bd_port -dir O eth_dma_s2mm_irq]
|
||||
set uart_irq [create_bd_port -dir O uart_irq]
|
||||
set gpio_lcd_irq [create_bd_port -dir O gpio_lcd_irq]
|
||||
set gpio_sw_irq [create_bd_port -dir O gpio_sw_irq]
|
||||
set spdif_dma_irq [create_bd_port -dir O spdif_dma_irq]
|
||||
set iic_irq [create_bd_port -dir O iic_irq]
|
||||
set hdmi_dma_irq [create_bd_port -dir O hdmi_dma_irq]
|
||||
|
||||
set mb_axi_intr [create_bd_port -dir I -from 31 -to 0 -type intr mb_axi_intr]
|
||||
|
||||
# instance: microblaze - processor
|
||||
|
||||
set sys_mb [create_bd_cell -type ip -vlnv xilinx.com:ip:microblaze:9.3 sys_mb]
|
||||
|
|
@ -150,13 +165,6 @@ set_property -dict [list CONFIG.C_ALL_OUTPUTS_2 {1}] $axi_gpio_sw_led
|
|||
set axi_intc [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_intc:4.1 axi_intc]
|
||||
set_property -dict [list CONFIG.C_HAS_FAST {0}] $axi_intc
|
||||
|
||||
set sys_concat_aux_intc [create_bd_cell -type ip -vlnv xilinx.com:ip:xlconcat:2.1 sys_concat_aux_intc]
|
||||
set_property -dict [list CONFIG.NUM_PORTS {9}] $sys_concat_aux_intc
|
||||
set_property -dict [list CONFIG.IN9_WIDTH {5}] $sys_concat_aux_intc
|
||||
|
||||
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 {5}] $sys_concat_intc
|
||||
|
||||
# hdmi peripherals
|
||||
|
||||
set axi_hdmi_clkgen [create_bd_cell -type ip -vlnv analog.com:user:axi_clkgen:1.0 axi_hdmi_clkgen]
|
||||
|
|
@ -209,9 +217,9 @@ connect_bd_intf_net -intf_net sys_mb_ilmb [get_bd_intf_pins sys_mb/ILMB] [get_bd
|
|||
# microblaze debug & interrupt
|
||||
|
||||
connect_bd_intf_net -intf_net sys_mb_debug [get_bd_intf_pins sys_mb_debug/MBDEBUG_0] [get_bd_intf_pins sys_mb/DEBUG]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr [get_bd_pins sys_concat_aux_intc/dout] [get_bd_pins axi_intc/intr]
|
||||
connect_bd_intf_net -intf_net sys_mb_interrupt [get_bd_intf_pins axi_intc/interrupt] [get_bd_intf_pins sys_mb/INTERRUPT]
|
||||
connect_bd_net -net sys_concat_intc_intr [get_bd_pins sys_concat_intc/dout] [get_bd_pins sys_concat_aux_intc/In8]
|
||||
connect_bd_net -net sys_concat_intr [get_bd_ports mb_axi_intr] [get_bd_pins axi_intc/intr]
|
||||
set_property -dict [list CONFIG.PortWidth {32}] [get_bd_ports mb_axi_intr]
|
||||
|
||||
# defaults (peripherals)
|
||||
|
||||
|
|
@ -342,19 +350,16 @@ connect_bd_intf_net -intf_net axi_ethernet_dma_rxs [get_bd_intf_pins axi_etherne
|
|||
|
||||
# defaults (interrupts)
|
||||
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_00 [get_bd_pins sys_concat_aux_intc/In0] [get_bd_pins axi_timer/interrupt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_01 [get_bd_pins sys_concat_aux_intc/In1] [get_bd_pins axi_ethernet/interrupt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_02 [get_bd_pins sys_concat_aux_intc/In2] [get_bd_pins axi_ethernet_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_03 [get_bd_pins sys_concat_aux_intc/In3] [get_bd_pins axi_ethernet_dma/s2mm_introut]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_04 [get_bd_pins sys_concat_aux_intc/In4] [get_bd_pins axi_uart/interrupt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_05 [get_bd_pins sys_concat_aux_intc/In5] [get_bd_pins axi_gpio_lcd/ip2intc_irpt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_06 [get_bd_pins sys_concat_aux_intc/In6] [get_bd_pins axi_gpio_sw_led/ip2intc_irpt]
|
||||
connect_bd_net -net sys_concat_aux_intc_intr_07 [get_bd_pins sys_concat_aux_intc/In7] [get_bd_pins axi_spdif_tx_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_concat_intc_din_0 [get_bd_pins sys_concat_intc/In0] [get_bd_pins axi_hdmi_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_concat_intc_din_1 [get_bd_pins sys_concat_intc/In1] [get_bd_pins axi_iic_main/iic2intc_irpt]
|
||||
connect_bd_net -net sys_concat_intc_din_2 [get_bd_pins sys_concat_intc/In2] [get_bd_ports unc_int2]
|
||||
connect_bd_net -net sys_concat_intc_din_3 [get_bd_pins sys_concat_intc/In3] [get_bd_ports unc_int3]
|
||||
connect_bd_net -net sys_concat_intc_din_4 [get_bd_pins sys_concat_intc/In4] [get_bd_ports unc_int4]
|
||||
connect_bd_net -net sys_base_intr_00 [get_bd_ports timer_irq] [get_bd_pins axi_timer/interrupt]
|
||||
connect_bd_net -net sys_base_intr_01 [get_bd_ports eth_irq] [get_bd_pins axi_ethernet/interrupt]
|
||||
connect_bd_net -net sys_base_intr_02 [get_bd_ports eth_dma_mm2s_irq] [get_bd_pins axi_ethernet_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_base_intr_03 [get_bd_ports eth_dma_s2mm_irq] [get_bd_pins axi_ethernet_dma/s2mm_introut]
|
||||
connect_bd_net -net sys_base_intr_04 [get_bd_ports uart_irq] [get_bd_pins axi_uart/interrupt]
|
||||
connect_bd_net -net sys_base_intr_05 [get_bd_ports gpio_lcd_irq] [get_bd_pins axi_gpio_lcd/ip2intc_irpt]
|
||||
connect_bd_net -net sys_base_intr_06 [get_bd_ports gpio_sw_irq] [get_bd_pins axi_gpio_sw_led/ip2intc_irpt]
|
||||
connect_bd_net -net sys_base_intr_07 [get_bd_ports spdif_dma_irq] [get_bd_pins axi_spdif_tx_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_base_intr_08 [get_bd_ports iic_irq] [get_bd_pins axi_hdmi_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_base_intr_09 [get_bd_ports hdmi_dma_irq] [get_bd_pins axi_iic_main/iic2intc_irpt]
|
||||
|
||||
# defaults (external interface)
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,12 @@ set hdmi_data [create_bd_port -dir O -from 15 -to 0 hdmi_data]
|
|||
|
||||
set spdif [create_bd_port -dir O spdif]
|
||||
|
||||
# interrupts
|
||||
|
||||
set iic_irq [create_bd_port -dir O iic_irq]
|
||||
set hdmi_dma_irq [create_bd_port -dir O hdmi_dma_irq]
|
||||
set ps7_irq_f2p [create_bd_port -dir I -from 15 -to 0 -type intr ps7_irq_f2p]
|
||||
|
||||
# instance: sys_ps7
|
||||
|
||||
set sys_ps7 [create_bd_cell -type ip -vlnv xilinx.com:ip:processing_system7:5.4 sys_ps7]
|
||||
|
|
@ -41,9 +47,6 @@ set_property -dict [list CONFIG.PCW_USE_DMA0 {1}] $sys_ps7
|
|||
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} CONFIG.IIC_BOARD_INTERFACE {IIC_MAIN}] $axi_iic_main
|
||||
|
||||
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 {5}] $sys_concat_intc
|
||||
|
||||
set axi_cpu_interconnect [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_interconnect:2.1 axi_cpu_interconnect]
|
||||
set_property -dict [list CONFIG.NUM_MI {7}] $axi_cpu_interconnect
|
||||
set_property -dict [list CONFIG.STRATEGY {1}] $axi_cpu_interconnect
|
||||
|
|
@ -113,9 +116,7 @@ connect_bd_net -net sys_100m_clk [get_bd_pins axi_cpu_interconnect/M00_ACLK] $sy
|
|||
connect_bd_net -net sys_100m_resetn [get_bd_pins axi_cpu_interconnect/M00_ARESETN] $sys_100m_resetn_source
|
||||
connect_bd_net -net sys_100m_clk [get_bd_pins axi_iic_main/s_axi_aclk]
|
||||
connect_bd_net -net sys_100m_resetn [get_bd_pins axi_iic_main/s_axi_aresetn]
|
||||
connect_bd_net -net sys_concat_intc_din_1 [get_bd_pins sys_concat_intc/In1] [get_bd_pins axi_iic_main/iic2intc_irpt]
|
||||
|
||||
connect_bd_net -net sys_ps7_interrupt [get_bd_pins sys_concat_intc/dout] [get_bd_pins sys_ps7/IRQ_F2P]
|
||||
connect_bd_net -net sys_concat_intc_din_1 [get_bd_ports iic_irq] [get_bd_pins axi_iic_main/iic2intc_irpt]
|
||||
|
||||
# hdmi
|
||||
|
||||
|
|
@ -167,7 +168,9 @@ connect_bd_net -net axi_hdmi_tx_core_mm2s_tready [get_bd_pins axi_hdmi_core/m_
|
|||
connect_bd_net -net axi_hdmi_tx_core_mm2s_fsync [get_bd_pins axi_hdmi_core/m_axis_mm2s_fsync] [get_bd_pins axi_hdmi_dma/mm2s_fsync]
|
||||
connect_bd_net -net axi_hdmi_tx_core_mm2s_fsync [get_bd_pins axi_hdmi_core/m_axis_mm2s_fsync_ret]
|
||||
|
||||
connect_bd_net -net sys_concat_intc_din_0 [get_bd_pins sys_concat_intc/In0] [get_bd_pins axi_hdmi_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_concat_intc_din_0 [get_bd_ports hdmi_dma_irq] [get_bd_pins axi_hdmi_dma/mm2s_introut]
|
||||
connect_bd_net -net sys_ps7_interrupt [get_bd_ports ps7_irq_f2p] [get_bd_pins sys_ps7/IRQ_F2P]
|
||||
set_property -dict [list CONFIG.PortWidth {16}] [get_bd_ports ps7_irq_f2p]
|
||||
|
||||
# spdif audio
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,12 @@ set hdmi_data [create_bd_port -dir O -from 23 -to 0 hdmi_data]
|
|||
|
||||
set spdif [create_bd_port -dir O spdif]
|
||||
|
||||
# interrupts
|
||||
|
||||
set iic_irq [create_bd_port -dir O iic_irq]
|
||||
set hdmi_dma_irq [create_bd_port -dir O hdmi_dma_irq]
|
||||
set ps7_irq_f2p [create_bd_port -dir I -from 15 -to 0 -type intr ps7_irq_f2p]
|
||||
|
||||
# instance: sys_ps7
|
||||
|
||||
set sys_ps7 [create_bd_cell -type ip -vlnv xilinx.com:ip:processing_system7:5.4 sys_ps7]
|
||||
|
|
@ -42,9 +48,6 @@ set_property -dict [list CONFIG.PCW_IRQ_F2P_MODE {REVERSE}] $sys_ps7
|
|||
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} CONFIG.IIC_BOARD_INTERFACE {IIC_MAIN}] $axi_iic_main
|
||||
|
||||
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
|
||||
|
||||
set axi_cpu_interconnect [create_bd_cell -type ip -vlnv xilinx.com:ip:axi_interconnect:2.1 axi_cpu_interconnect]
|
||||
set_property -dict [list CONFIG.NUM_MI {7}] $axi_cpu_interconnect
|
||||
set_property -dict [list CONFIG.STRATEGY {1}] $axi_cpu_interconnect
|
||||
|
|
@ -115,9 +118,8 @@ connect_bd_net -net sys_100m_clk [get_bd_pins axi_cpu_interconnect/M00_ACLK] $sy
|
|||
connect_bd_net -net sys_100m_resetn [get_bd_pins axi_cpu_interconnect/M00_ARESETN] $sys_100m_resetn_source
|
||||
connect_bd_net -net sys_100m_clk [get_bd_pins axi_iic_main/s_axi_aclk]
|
||||
connect_bd_net -net sys_100m_resetn [get_bd_pins axi_iic_main/s_axi_aresetn]
|
||||
connect_bd_net -net sys_concat_intc_din_1 [get_bd_pins sys_concat_intc/In14] [get_bd_pins axi_iic_main/iic2intc_irpt]
|
||||
connect_bd_net -net iic_irq_net [get_bd_pins axi_iic_main/iic2intc_irpt] [get_bd_ports iic_irq]
|
||||
|
||||
connect_bd_net -net sys_ps7_interrupt [get_bd_pins sys_concat_intc/dout] [get_bd_pins sys_ps7/IRQ_F2P]
|
||||
|
||||
# hdmi
|
||||
|
||||
|
|
@ -169,7 +171,10 @@ connect_bd_net -net axi_hdmi_tx_core_mm2s_tready [get_bd_pins axi_hdmi_core/m_
|
|||
connect_bd_net -net axi_hdmi_tx_core_mm2s_fsync [get_bd_pins axi_hdmi_core/m_axis_mm2s_fsync] [get_bd_pins axi_hdmi_dma/mm2s_fsync]
|
||||
connect_bd_net -net axi_hdmi_tx_core_mm2s_fsync [get_bd_pins axi_hdmi_core/m_axis_mm2s_fsync_ret]
|
||||
|
||||
connect_bd_net -net sys_concat_intc_din_0 [get_bd_pins sys_concat_intc/In15] [get_bd_pins axi_hdmi_dma/mm2s_introut]
|
||||
connect_bd_net -net hdmi_dma_irq_net [get_bd_pins axi_hdmi_dma/mm2s_introut] [get_bd_ports hdmi_dma_irq]
|
||||
|
||||
connect_bd_net -net sys_ps7_interrupt [get_bd_pins sys_ps7/IRQ_F2P] [get_bd_ports ps7_irq_f2p]
|
||||
set_property -dict [list CONFIG.PortWidth {16}] [get_bd_ports ps7_irq_f2p]
|
||||
|
||||
# spdif audio
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue