diff options
| author | Josh Blum <josh@joshknows.com> | 2010-07-07 02:23:38 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-07-07 02:23:38 +0000 |
| commit | f2e9d3ed0941dc5738149dd82d1eac158bdf0a0f (patch) | |
| tree | 82a350987e32cd329ab5fe56b6dd9fbfef08230f /fpga | |
| parent | 998fee6ef064f1d53a61dd0eec79276d1e85291e (diff) | |
| parent | 5c2cccfe8c4a9c6c912a4d18dc1e7a6f84c79609 (diff) | |
| download | uhd-f2e9d3ed0941dc5738149dd82d1eac158bdf0a0f.tar.gz uhd-f2e9d3ed0941dc5738149dd82d1eac158bdf0a0f.tar.bz2 uhd-f2e9d3ed0941dc5738149dd82d1eac158bdf0a0f.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Conflicts:
host/examples/rx_timed_samples.cpp
Diffstat (limited to 'fpga')
| -rw-r--r-- | fpga/usrp2/serdes/serdes_rx.v | 9 | ||||
| -rw-r--r-- | fpga/usrp2/top/Makefile.common | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/fpga/usrp2/serdes/serdes_rx.v b/fpga/usrp2/serdes/serdes_rx.v index afefccaa1..b6688e858 100644 --- a/fpga/usrp2/serdes/serdes_rx.v +++ b/fpga/usrp2/serdes/serdes_rx.v @@ -260,12 +260,13 @@ module serdes_rx // Internal FIFO, size 9 is 2K, size 10 is 4K Bytes assign write = eop_i | (error_i & have_space) | (write_d & (state != CRC_CHECK)); - - fifo_2clock_cascade #(.WIDTH(35),.SIZE(FIFOSIZE)) serdes_rx_fifo + wire dummy; // avoid warning on unconnected pin + + fifo_2clock_cascade #(.WIDTH(36),.SIZE(FIFOSIZE)) serdes_rx_fifo (.arst(rst), - .wclk(ser_rx_clk),.datain({error_i,sop_i,eop_i,line_i}), + .wclk(ser_rx_clk),.datain({1'b0,error_i,sop_i,eop_i,line_i}), .src_rdy_i(write), .dst_rdy_o(have_space), .space(fifo_space), - .rclk(clk),.dataout({error_o,sop_o,eop_o,line_o}), + .rclk(clk),.dataout({dummy,error_o,sop_o,eop_o,line_o}), .src_rdy_o(wr_ready_o), .dst_rdy_i(wr_ready_i), .occupied(fifo_occupied) ); assign fifo_full = ~have_space; // Note -- in the wrong clock domain diff --git a/fpga/usrp2/top/Makefile.common b/fpga/usrp2/top/Makefile.common index d1c89fdfb..d0435fa1e 100644 --- a/fpga/usrp2/top/Makefile.common +++ b/fpga/usrp2/top/Makefile.common @@ -42,7 +42,8 @@ clean: ################################################## # Dependency Targets ################################################## -$(ISE_FILE): $(SOURCES) +.SECONDEXPANSION: +$(ISE_FILE): $$(SOURCES) $$(MAKEFILE_LIST) @echo $@ $(ISE_HELPER) "" |