python: Move the rfnoc image builder module under the uhd module

Note: This commit changes nothing to the way the image builder is being
called. One can still run

    rfnoc_image_builder [...]

as before. The difference is in the Python guts:
Where previously one had to do

    import rfnoc

now the incantation becomes:

    from uhd import imgbuilder

(Note that the submodule uhd.rfnoc already exists for wrapping the RFNoC
API into Python, hence the renaming from rfnoc to imgbuilder).

This is done for a variety of reasons:

- Now, there is only one and exactly one Python module for UHD that
  contains all the things, as opposed to before where there were two.
- The rfnoc and uhd modules were installed in different ways (setuptools
  vs. CMake); that is now harmonized. This also removes a lot of CMake
  plumbing.
- It is not common to import the rfnoc module for anyone other than
  rfnoc_image_builder

1 files changed, 0 insertions, 39 deletions

diff --git a/host/utils/rfnoc/templates/modules/ctrl_crossbar.v.mako b/host/utils/rfnoc/templates/modules/ctrl_crossbar.v.mako
deleted file mode 100644
index 5872e270e..000000000
--- a/host/utils/rfnoc/templates/modules/ctrl_crossbar.v.mako
+++ /dev/null
@@ -1,39 +0,0 @@
-<%page args="seps, blocks"/>\
-\
-<%
-  import re
-  axisstr = ""
-  for block in reversed(list(blocks.keys())):
-    axisstr += "{0}_%s_ctrl_{1}, " % block
-  for sep in reversed(list(seps.keys())):
-    axisstr += "{0}_%s_ctrl_{1}, " % sep
-  axisstr += "{0}_core_ctrl_{1}"
-%>\
-%for block in blocks:
-  wire [31:0]       m_${block}_ctrl_tdata ,   s_${block}_ctrl_tdata ;
-  wire              m_${block}_ctrl_tlast ,   s_${block}_ctrl_tlast ;
-  wire              m_${block}_ctrl_tvalid,   s_${block}_ctrl_tvalid;
-  wire              m_${block}_ctrl_tready,   s_${block}_ctrl_tready;
-%endfor
-
-  axis_ctrl_crossbar_nxn #(
-    .WIDTH            (32),
-    .NPORTS           (${len(seps) + len(blocks) + 1}),
-    .TOPOLOGY         ("TORUS"),
-    .INGRESS_BUFF_SIZE(5),
-    .ROUTER_BUFF_SIZE (5),
-    .ROUTING_ALLOC    ("WORMHOLE"),
-    .SWITCH_ALLOC     ("PRIO")
-  ) ctrl_xb_i (
-    .clk              (rfnoc_ctrl_clk),
-    .reset            (rfnoc_ctrl_rst),
-    .s_axis_tdata     ({${axisstr.format("m", "tdata ")}}),
-    .s_axis_tvalid    ({${axisstr.format("m", "tvalid")}}),
-    .s_axis_tlast     ({${axisstr.format("m", "tlast ")}}),
-    .s_axis_tready    ({${axisstr.format("m", "tready")}}),
-    .m_axis_tdata     ({${axisstr.format("s", "tdata ")}}),
-    .m_axis_tvalid    ({${axisstr.format("s", "tvalid")}}),
-    .m_axis_tlast     ({${axisstr.format("s", "tlast ")}}),
-    .m_axis_tready    ({${axisstr.format("s", "tready")}}),
-    .deadlock_detected()
-  );