diff options
| author | Josh Blum <josh@joshknows.com> | 2010-01-05 14:39:52 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-01-05 14:39:52 -0800 |
| commit | 6b0dc91d66eb56bb682295d07c97caf0f07da8b1 (patch) | |
| tree | 940850e3f2a8695eba30b73a43d589558bfc7ff8 /top/u2_rev3 | |
| parent | f238468d299312ed562c6f711150f04b070818ed (diff) | |
| parent | 5c2e94296991891d973ad7bd99ee59cded3a5418 (diff) | |
| download | uhd-6b0dc91d66eb56bb682295d07c97caf0f07da8b1.tar.gz uhd-6b0dc91d66eb56bb682295d07c97caf0f07da8b1.tar.bz2 uhd-6b0dc91d66eb56bb682295d07c97caf0f07da8b1.zip | |
Merge branch 'udp' of http://gnuradio.org/git/matt into wip/usrp2
Conflicts:
usrp2/fpga/top/u2_rev3/Makefile
Diffstat (limited to 'top/u2_rev3')
| -rw-r--r-- | top/u2_rev3/Makefile | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/top/u2_rev3/Makefile b/top/u2_rev3/Makefile index 1f8bbe304..d27469f47 100644 --- a/top/u2_rev3/Makefile +++ b/top/u2_rev3/Makefile @@ -88,7 +88,12 @@ vrt/vita_rx_control.v \ vrt/vita_rx_framer.v \ vrt/vita_tx_control.v \ vrt/vita_tx_deframer.v \ +udp/udp_wrapper.v \ +udp/fifo19_rxrealign.v \ +udp/prot_eng_tx.v \ +udp/add_onescomp.v \ simple_gemac/simple_gemac_wrapper.v \ +simple_gemac/simple_gemac_wrapper19.v \ simple_gemac/simple_gemac.v \ simple_gemac/simple_gemac_wb.v \ simple_gemac/simple_gemac_tx.v \ @@ -109,11 +114,15 @@ control_lib/newfifo/buffer_pool.v \ control_lib/newfifo/fifo_2clock.v \ control_lib/newfifo/fifo_2clock_cascade.v \ control_lib/newfifo/ll8_shortfifo.v \ -control_lib/newfifo/ll8_to_fifo36.v \ control_lib/newfifo/fifo_short.v \ control_lib/newfifo/fifo_long.v \ control_lib/newfifo/fifo_cascade.v \ control_lib/newfifo/fifo36_to_ll8.v \ +control_lib/newfifo/ll8_to_fifo36.v \ +control_lib/newfifo/fifo19_to_ll8.v \ +control_lib/newfifo/ll8_to_fifo19.v \ +control_lib/newfifo/fifo36_to_fifo19.v \ +control_lib/newfifo/fifo19_to_fifo36.v \ control_lib/longfifo.v \ control_lib/shortfifo.v \ control_lib/medfifo.v \ @@ -123,6 +132,8 @@ coregen/fifo_xlnx_512x36_2clk.v \ coregen/fifo_xlnx_512x36_2clk.xco \ coregen/fifo_xlnx_64x36_2clk.v \ coregen/fifo_xlnx_64x36_2clk.xco \ +coregen/fifo_xlnx_16x19_2clk.v \ +coregen/fifo_xlnx_16x19_2clk.xco \ extram/wb_zbt16_b.v \ opencores/8b10b/decode_8b10b.v \ opencores/8b10b/encode_8b10b.v \ |