diff options
| author | Josh Blum <josh@joshknows.com> | 2010-12-12 17:54:04 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-12-12 17:54:04 -0800 |
| commit | ab9edbfbcb065b3ec380992b3b5836833ce92b4b (patch) | |
| tree | dc8be06a67a75e8d9b713c62841104e1f619964b /usrp2/top/u2_rev3/Makefile | |
| parent | b6b5b7b65dca848322941c2df73d1b9f5b6ac907 (diff) | |
| parent | 6c1d4ebdbd2229654976dd672a5433c300dc0d17 (diff) | |
| download | uhd-ab9edbfbcb065b3ec380992b3b5836833ce92b4b.tar.gz uhd-ab9edbfbcb065b3ec380992b3b5836833ce92b4b.tar.bz2 uhd-ab9edbfbcb065b3ec380992b3b5836833ce92b4b.zip | |
Merge branch 'packet_router' into zpu
Conflicts:
usrp2/top/u2_rev3/u2_core.v
Diffstat (limited to 'usrp2/top/u2_rev3/Makefile')
| -rw-r--r-- | usrp2/top/u2_rev3/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usrp2/top/u2_rev3/Makefile b/usrp2/top/u2_rev3/Makefile index 68c296b9b..05ada2476 100644 --- a/usrp2/top/u2_rev3/Makefile +++ b/usrp2/top/u2_rev3/Makefile @@ -6,7 +6,7 @@ # Project Setup ################################################## TOP_MODULE = u2_rev3 -BUILD_DIR = $(abspath build$(ISE)) +BUILD_DIR = $(abspath build) ################################################## # Include other makefiles @@ -24,6 +24,8 @@ include ../../vrt/Makefile.srcs include ../../udp/Makefile.srcs include ../../coregen/Makefile.srcs include ../../extram/Makefile.srcs +include ../../extramfifo/Makefile.srcs + ################################################## # Project Properties |