summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Foster <nick@nerdnetworks.org>2011-06-10 15:03:19 -0700
committerNick Foster <nick@nerdnetworks.org>2011-06-10 15:03:19 -0700
commitc0fadece89314f3a00892122c28caf187ce1a717 (patch)
tree65683bc6a5b348e5f10c6da6a203cc86696ae05f
parent23c373f4ebea614a59f2032293b0264d93468fef (diff)
downloaduhd-c0fadece89314f3a00892122c28caf187ce1a717.tar.gz
uhd-c0fadece89314f3a00892122c28caf187ce1a717.tar.bz2
uhd-c0fadece89314f3a00892122c28caf187ce1a717.zip
N2XX: this method for defining R3/R4 actually works
-rw-r--r--usrp2/top/N2x0/Makefile.N200R44
-rw-r--r--usrp2/top/N2x0/Makefile.N210R44
-rw-r--r--usrp2/top/N2x0/rev4_defs.v18
3 files changed, 4 insertions, 22 deletions
diff --git a/usrp2/top/N2x0/Makefile.N200R4 b/usrp2/top/N2x0/Makefile.N200R4
index 955aadc59..0ca40e1bd 100644
--- a/usrp2/top/N2x0/Makefile.N200R4
+++ b/usrp2/top/N2x0/Makefile.N200R4
@@ -45,7 +45,6 @@ simulator "ISE Simulator (VHDL/Verilog)" \
# Sources
##################################################
TOP_SRCS = \
-rev4_defs.v \
capture_ddrlvds.v \
u2plus_core.v \
u2plus.v \
@@ -67,7 +66,8 @@ SYNTHESIZE_PROPERTIES = \
"Register Balancing" Yes \
"Use Clock Enable" Auto \
"Use Synchronous Reset" Auto \
-"Use Synchronous Set" Auto
+"Use Synchronous Set" Auto \
+"Verilog Macros" "LVDS=1"
TRANSLATE_PROPERTIES = \
"Macro Search Path" "$(shell pwd)/../../coregen/"
diff --git a/usrp2/top/N2x0/Makefile.N210R4 b/usrp2/top/N2x0/Makefile.N210R4
index 73747e544..01a9e19fd 100644
--- a/usrp2/top/N2x0/Makefile.N210R4
+++ b/usrp2/top/N2x0/Makefile.N210R4
@@ -45,7 +45,6 @@ simulator "ISE Simulator (VHDL/Verilog)" \
# Sources
##################################################
TOP_SRCS = \
-rev4_defs.v \
capture_ddrlvds.v \
u2plus_core.v \
u2plus.v \
@@ -67,7 +66,8 @@ SYNTHESIZE_PROPERTIES = \
"Register Balancing" Yes \
"Use Clock Enable" Auto \
"Use Synchronous Reset" Auto \
-"Use Synchronous Set" Auto
+"Use Synchronous Set" Auto \
+"Verilog Macros" "LVDS=1"
TRANSLATE_PROPERTIES = \
"Macro Search Path" "$(shell pwd)/../../coregen/"
diff --git a/usrp2/top/N2x0/rev4_defs.v b/usrp2/top/N2x0/rev4_defs.v
deleted file mode 100644
index f8f6667ac..000000000
--- a/usrp2/top/N2x0/rev4_defs.v
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// Copyright 2011 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//
-
-`define LVDS 1