From 28a1d079a7b2198096d665ee40c18b4cc1b748d2 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Tue, 24 Sep 2019 13:51:25 -0700 Subject: images: Fix THIS_PORTID calculation to offset from num ctrl_seps THIS_PORTID was calculating the block port ID via the number of SEPs in the design, but it should be smaller when not all SEPs have a ctrl port. This commit fixes that calculation. --- host/utils/rfnoc/templates/rfnoc_image_core.v.mako | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/utils/rfnoc/templates/rfnoc_image_core.v.mako b/host/utils/rfnoc/templates/rfnoc_image_core.v.mako index 57b70ece3..fb3cb3d2e 100644 --- a/host/utils/rfnoc/templates/rfnoc_image_core.v.mako +++ b/host/utils/rfnoc/templates/rfnoc_image_core.v.mako @@ -131,7 +131,7 @@ module rfnoc_image_core #( // Blocks // ---------------------------------------------------- %for i, name in enumerate(config.noc_blocks): -<%include file="/modules/rfnoc_block.v.mako" args="block_id=i + len(config.stream_endpoints) + 1, block_number=i, block_name=name, block=config.blocks[config.noc_blocks[name]['block_desc']], block_params=config.noc_blocks[name]['parameters']"/> +<%include file="/modules/rfnoc_block.v.mako" args="block_id=i + len(ctrl_seps) + 1, block_number=i, block_name=name, block=config.blocks[config.noc_blocks[name]['block_desc']], block_params=config.noc_blocks[name]['parameters']"/> %endfor // ---------------------------------------------------- -- cgit v1.2.3