From 7d69dcdcc318ccdf87038b732acbf2bf7c087b60 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Tue, 20 Aug 2019 10:00:47 -0700
Subject: 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
---
 host/utils/rfnoc_blocktool/templates/Makefile      | 16 ++++++++--------
 host/utils/rfnoc_blocktool/templates/Makefile.srcs |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'host/utils/rfnoc_blocktool')

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 ${"\\"}
 ))
-- 
cgit v1.2.3