diff options
| author | Josh Blum <josh@joshknows.com> | 2010-12-10 13:49:56 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-12-10 13:49:56 -0800 |
| commit | 16530d02eb8088f6806cb146ceab2fea89c4ee0b (patch) | |
| tree | 67d17944c5b07ee0c6a91c0b9edadef8820769b2 /usrp2/top/u2_rev3/Makefile | |
| parent | 8c7d238c4fde0c3388aba2f91894076af6c5068a (diff) | |
| parent | c97440838aa740fc335c59914f6dfd6f492b69f8 (diff) | |
| download | uhd-16530d02eb8088f6806cb146ceab2fea89c4ee0b.tar.gz uhd-16530d02eb8088f6806cb146ceab2fea89c4ee0b.tar.bz2 uhd-16530d02eb8088f6806cb146ceab2fea89c4ee0b.zip | |
Merge branch 'ise12' into packet_router
Conflicts:
usrp2/top/u2_rev3/Makefile
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, 2 insertions, 2 deletions
diff --git a/usrp2/top/u2_rev3/Makefile b/usrp2/top/u2_rev3/Makefile index 99effb038..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-udp$(ISE)) +BUILD_DIR = $(abspath build) ################################################## # Include other makefiles @@ -46,7 +46,7 @@ simulator "ISE Simulator (VHDL/Verilog)" \ # Sources ################################################## TOP_SRCS = \ -u2_core_udp.v \ +u2_core.v \ u2_rev3.v \ u2_rev3.ucf |