diff options
| author | Matt Ettus <matt@ettus.com> | 2010-05-28 18:02:18 -0700 |
|---|---|---|
| committer | Matt Ettus <matt@ettus.com> | 2010-05-28 18:02:18 -0700 |
| commit | d4791a6257d31503d4ce4895181a90b5d9972cfe (patch) | |
| tree | d425f8c7ac13b99fdc5135091d66e6fe30fcaff1 /usrp2/top/u2_rev3 | |
| parent | d488c6b2cc40221d395f053891c1c89c1305fae5 (diff) | |
| parent | 1c8fc02f8787b8f809335d18a6691c2d7510be9a (diff) | |
| download | uhd-d4791a6257d31503d4ce4895181a90b5d9972cfe.tar.gz uhd-d4791a6257d31503d4ce4895181a90b5d9972cfe.tar.bz2 uhd-d4791a6257d31503d4ce4895181a90b5d9972cfe.zip | |
Merge branch 'master_nocache' into master_nocache_post_merge
Seems to work on raw ethernet version which was automatically merged
UDP version untested, and the following files were merged manually:
u2_core_udp.v
Makefile.udp
* master_nocache:
change the debug pins, which makes it more reliable. This is unnerving.
fixes from IJB from 5/24. Basically connect unconnected wires.
removes the icache and pipelines the reads
Diffstat (limited to 'usrp2/top/u2_rev3')
| -rw-r--r-- | usrp2/top/u2_rev3/Makefile | 1 | ||||
| -rw-r--r-- | usrp2/top/u2_rev3/Makefile.udp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/usrp2/top/u2_rev3/Makefile b/usrp2/top/u2_rev3/Makefile index 7eedf5e7f..541f3264f 100644 --- a/usrp2/top/u2_rev3/Makefile +++ b/usrp2/top/u2_rev3/Makefile @@ -66,6 +66,7 @@ control_lib/mux4.v \ control_lib/mux8.v \ control_lib/nsgpio.v \ control_lib/ram_2port.v \ +control_lib/ram_harvard.v \ control_lib/ram_harv_cache.v \ control_lib/ram_loader.v \ control_lib/setting_reg.v \ diff --git a/usrp2/top/u2_rev3/Makefile.udp b/usrp2/top/u2_rev3/Makefile.udp index e445fe3b2..fa94c7bd1 100644 --- a/usrp2/top/u2_rev3/Makefile.udp +++ b/usrp2/top/u2_rev3/Makefile.udp @@ -66,6 +66,7 @@ control_lib/mux4.v \ control_lib/mux8.v \ control_lib/nsgpio.v \ control_lib/ram_2port.v \ +control_lib/ram_harvard.v \ control_lib/ram_harv_cache.v \ control_lib/ram_loader.v \ control_lib/setting_reg.v \ |