Remove proto-RFNoC files

This commit removes all files and parts of files that are used by
proto-RFNoC only.

uhd: Fix include CMakeLists.txt, add missing files

5 files changed, 14 insertions, 15 deletions

diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt
index 834c69c19..8542f30bb 100644
--- a/host/utils/CMakeLists.txt
+++ b/host/utils/CMakeLists.txt
@@ -165,7 +165,7 @@ add_subdirectory(rfnoc)
 set(OUTPUT      "${CMAKE_CURRENT_BINARY_DIR}/build/timestamp")
 set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in")
 set(SETUP_PY    "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
-set(CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/share/uhd")
+set(CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${PKG_DATA_DIR}")
 
 # construct site-package folder from install prefix
 execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
diff --git a/host/utils/rfnoc/image_builder.py b/host/utils/rfnoc/image_builder.py
index 0ed75dcc2..df3cfc3f1 100755
--- a/host/utils/rfnoc/image_builder.py
+++ b/host/utils/rfnoc/image_builder.py
@@ -449,7 +449,7 @@ def collect_module_paths(config_path):
     :return: list of noc block directories
     """
     # rfnoc blocks
-    result = [os.path.join(config_path, 'erfnoc', 'blocks')]
+    result = [os.path.join(config_path, 'rfnoc', 'blocks')]
     # additional OOT blocks
     # TODO parse modules from external includes as well
     return result
@@ -675,7 +675,7 @@ def get_core_config_path(config_path):
     """
     returns the path where core configuration files are stored
     """
-    return os.path.join(config_path, 'erfnoc', 'core')
+    return os.path.join(config_path, 'rfnoc', 'core')
 
 def generate_image_core_path(output_path, source):
     """
diff --git a/host/utils/rfnoc_blocktool/templates/Makefile b/host/utils/rfnoc_blocktool/templates/Makefile
index 25e61c05b..ca397bf7d 100644
--- a/host/utils/rfnoc_blocktool/templates/Makefile
+++ b/host/utils/rfnoc_blocktool/templates/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright 2019 Ettus Research, A National Instruments Company
+# Copyright 2019 Ettus Research, A National Instruments Brand
 #
 # SPDX-License-Identifier: LGPL-3.0-or-later
 #
@@ -16,26 +16,26 @@ include $(BASE_DIR)/../tools/make/viv_sim_preamble.mak
 # Design Specific
 #-------------------------------------------------
 # Include makefiles and sources for the DUT and its dependencies
-include $(BASE_DIR)/../lib/erfnoc/core/Makefile.srcs
-include $(BASE_DIR)/../lib/erfnoc/utils/Makefile.srcs
+include $(BASE_DIR)/../lib/rfnoc/core/Makefile.srcs
+include $(BASE_DIR)/../lib/rfnoc/utils/Makefile.srcs
 include Makefile.srcs
 
 DESIGN_SRCS += $(abspath ${"\\"}
 $(RFNOC_CORE_SRCS) ${"\\"}
 $(RFNOC_UTIL_SRCS) ${"\\"}
-$(RFNOC_BLOCK_${config.module_name.upper()}_SRCS) ${"\\"}
+$(RFNOC_BLOCK_${config['module_name'].upper()}_SRCS) ${"\\"}
 )
 
 #-------------------------------------------------
 # Testbench Specific
 #-------------------------------------------------
-include $(BASE_DIR)/../sim/erfnoc/Makefile.srcs
+include $(BASE_DIR)/../sim/rfnoc/Makefile.srcs
 
-SIM_TOP = rfnoc_block_${config.module_name}_tb
+SIM_TOP = rfnoc_block_${config['module_name']}_tb
 
 SIM_SRCS = ${"\\"}
-$(abspath rfnoc_block_${config.module_name}_tb.sv) ${"\\"}
-$(SIM_ERFNOC_SRCS)
+$(abspath rfnoc_block_${config['module_name']}_tb.sv) ${"\\"}
+$(SIM_RFNOC_SRCS)
 
 # MODELSIM_USER_DO = $(abspath wave.do)
 
diff --git a/host/utils/rfnoc_blocktool/templates/Makefile.srcs b/host/utils/rfnoc_blocktool/templates/Makefile.srcs
index f346007af..67fcb1ccc 100644
--- a/host/utils/rfnoc_blocktool/templates/Makefile.srcs
+++ b/host/utils/rfnoc_blocktool/templates/Makefile.srcs
@@ -7,7 +7,7 @@
 ${'##################################################'}
 # RFNoC Utility Sources
 ${'##################################################'}
-RFNOC_BLOCK_${config.module_name.upper()}_SRCS = $(abspath $(addprefix $(BASE_DIR)/../lib/erfnoc/blocks/${destination}/, ${"\\"}
-rfnoc_block_${config.module_name}.v ${"\\"}
-noc_shell_${config.module_name}.v ${"\\"}
+RFNOC_BLOCK_${config['module_name'].upper()}_SRCS = $(abspath $(addprefix $(BASE_DIR)/../lib/rfnoc/blocks/${destination}/, ${"\\"}
+rfnoc_block_${config['module_name']}.v ${"\\"}
+noc_shell_${config['module_name']}.v ${"\\"}
 ))
diff --git a/host/utils/uhd_usrp_probe.cpp b/host/utils/uhd_usrp_probe.cpp
index c35a5af23..7fd42941e 100644
--- a/host/utils/uhd_usrp_probe.cpp
+++ b/host/utils/uhd_usrp_probe.cpp
@@ -6,7 +6,6 @@
 //
 
 #include <uhd/device.hpp>
-#include <uhd/device3.hpp>
 #include <uhd/property_tree.hpp>
 #include <uhd/types/ranges.hpp>
 #include <uhd/types/sensors.hpp>