From 0df7b0071caebaf2af3304bf9397fe64c670ee04 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 27 Jun 2024 11:04:31 +0200 Subject: [PATCH] fpga: Fix warnings from building N3xx AA images These bitfiles use four-port DRAM FIFOs and only connect two of those ports. We skip the warnings as that is the intended build behaviour. Original-commit: 52860eeb670da53c08dddb40dd950832b087acbe --- top/n3xx/n300_bist_rfnoc_image_core.yml | 8 +++++++- top/n3xx/n310_bist_rfnoc_image_core.yml | 7 +++++++ top/n3xx/n320_bist_rfnoc_image_core.yml | 7 +++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/top/n3xx/n300_bist_rfnoc_image_core.yml b/top/n3xx/n300_bist_rfnoc_image_core.yml index 2aa60c3..15740b4 100644 --- a/top/n3xx/n300_bist_rfnoc_image_core.yml +++ b/top/n3xx/n300_bist_rfnoc_image_core.yml @@ -70,12 +70,18 @@ connections: - { srcblk: ep1, srcport: out0, dstblk: radio0, dstport: in_1 } # RF 1 RX - { srcblk: radio0, srcport: out_1, dstblk: ep1, dstport: in0 } - # # DRAM FIFO Connections - { srcblk: ep4, srcport: out0, dstblk: fifo0, dstport: in_0 } - { srcblk: fifo0, srcport: out_0, dstblk: ep4, dstport: in0 } - { srcblk: ep5, srcport: out0, dstblk: fifo0, dstport: in_1 } - { srcblk: fifo0, srcport: out_1, dstblk: ep5, dstport: in0 } + # The FIFO block has four ports to match the memory configuration, but their + # RFNoC ports don't get connected. We flag that here explicitly to avoid + # warnings from the image builder. + - { srcblk: _device_, srcport: _none_, dstblk: fifo0, dstport: in_2 } + - { srcblk: fifo0, srcport: out_2, dstblk: _device_, dstport: _none_ } + - { srcblk: _device_, srcport: _none_, dstblk: fifo0, dstport: in_3 } + - { srcblk: fifo0, srcport: out_3, dstblk: _device_, dstport: _none_ } # # BSP Connections - { srcblk: radio0, srcport: ctrlport, dstblk: _device_, dstport: ctrlport_radio0 } diff --git a/top/n3xx/n310_bist_rfnoc_image_core.yml b/top/n3xx/n310_bist_rfnoc_image_core.yml index e9b8d2b..3c3bad9 100644 --- a/top/n3xx/n310_bist_rfnoc_image_core.yml +++ b/top/n3xx/n310_bist_rfnoc_image_core.yml @@ -95,6 +95,13 @@ connections: - { srcblk: fifo0, srcport: out_0, dstblk: ep4, dstport: in0 } - { srcblk: ep5, srcport: out0, dstblk: fifo0, dstport: in_1 } - { srcblk: fifo0, srcport: out_1, dstblk: ep5, dstport: in0 } + # The FIFO block has four ports to match the memory configuration, but their + # RFNoC ports don't get connected. We flag that here explicitly to avoid + # warnings from the image builder. + - { srcblk: _device_, srcport: _none_, dstblk: fifo0, dstport: in_2 } + - { srcblk: fifo0, srcport: out_2, dstblk: _device_, dstport: _none_ } + - { srcblk: _device_, srcport: _none_, dstblk: fifo0, dstport: in_3 } + - { srcblk: fifo0, srcport: out_3, dstblk: _device_, dstport: _none_ } # # BSP Connections - { srcblk: radio0, srcport: ctrlport, dstblk: _device_, dstport: ctrlport_radio0 } diff --git a/top/n3xx/n320_bist_rfnoc_image_core.yml b/top/n3xx/n320_bist_rfnoc_image_core.yml index 75c5631..992da1c 100644 --- a/top/n3xx/n320_bist_rfnoc_image_core.yml +++ b/top/n3xx/n320_bist_rfnoc_image_core.yml @@ -81,6 +81,13 @@ connections: - { srcblk: fifo0, srcport: out_0, dstblk: ep4, dstport: in0 } - { srcblk: ep5, srcport: out0, dstblk: fifo0, dstport: in_1 } - { srcblk: fifo0, srcport: out_1, dstblk: ep5, dstport: in0 } + # The FIFO block has four ports to match the memory configuration, but their + # RFNoC ports don't get connected. We flag that here explicitly to avoid + # warnings from the image builder. + - { srcblk: _device_, srcport: _none_, dstblk: fifo0, dstport: in_2 } + - { srcblk: fifo0, srcport: out_2, dstblk: _device_, dstport: _none_ } + - { srcblk: _device_, srcport: _none_, dstblk: fifo0, dstport: in_3 } + - { srcblk: fifo0, srcport: out_3, dstblk: _device_, dstport: _none_ } # # BSP Connections - { srcblk: radio0, srcport: ctrlport, dstblk: _device_, dstport: ctrlport_radio0 }