Merge branch 'cabal_fix_chrouter' into 'devel'

APP: [FEATURE] Add default_mode and opt_mode in dts_mvb_channel_router See merge request ndk/ndk-app-minimal!66
CESNET · Aug 22, 2024 · 216303d · 216303d
2 parents 74064e6 + a4e5ac5
commit 216303d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/top/DevTree.tcl b/app/top/DevTree.tcl
@@ -57,7 +57,7 @@ proc dts_app_minimal_core {index base reg_size} {
     append ret "app_core_minimal_$index {"
     append ret "reg = <$base $reg_size>;"
     append ret "compatible = \"cesnet,minimal,app_core\";"
-    append ret [dts_mvb_channel_router "rx_chan_router" $base $ETH_PORT_CHAN($index)]
+    append ret [dts_mvb_channel_router "rx_chan_router" $base $ETH_PORT_CHAN($index) 2 1]
     append ret "};"
     return $ret
 }

diff --git a/ndk/cards b/ndk/cards
diff --git a/ndk/core b/ndk/core
diff --git a/ndk/ofm b/ndk/ofm
+9 −4		amd/alveo-u200/src/fpga.vhd
+7 −1		amd/alveo-u55c/src/Modules.tcl
+2 −0		amd/alveo-u55c/src/fpga.vhd
+11 −8		reflexces/agi-fh400g/src/fpga.vhd
+17 −0		comp/base/mem/mp_bram/cocotb/Makefile
+124 −0		comp/base/mem/mp_bram/cocotb/cocotb_test.py
+37 −0		comp/base/mem/mp_bram/cocotb/cocotb_test_sig.fdo
+279 −51		comp/base/mem/mp_bram/mp_bram.vhd
+1 −1		comp/base/mem/sdp_bram/sdp_bram.vhd
+8 −4		comp/mvb_tools/flow/channel_router/DevTree.tcl
+4 −6		python/cocotbext/cocotbext/nfb/ext/python/servicer.py
+18 −25		python/cocotbext/cocotbext/ofm/pcie/AvstCompleter.py
+39 −23		python/cocotbext/cocotbext/ofm/pcie/AvstRequester.py
+7 −5		python/cocotbext/cocotbext/ofm/pcie/Axi4SCompleter.py