Merge branch 'serdes_newfifo' into new_eth

diff --combined usrp2/fpga/top/u2_core/u2_core.v
index e55783d0be243ee4e4e70db15da045cc3f0fa189,e4c224ab66a6c3c33f3c266dbe8b2adc8b8f93b4..4568005214a363a407b36afed80452e240551902
--- 1/usrp2/fpga/top/u2_core/u2_core.v
--- 2/usrp2/fpga/top/u2_core/u2_core.v
+++ b/usrp2/fpga/top/u2_core/u2_core.v
@@@ -572,7 -572,7 +572,7 @@@ module u2_cor
       (.clk(dsp_clk), .rst(dsp_rst),
        .set_stb(set_stb),.set_addr(set_addr),.set_data(set_data),
        .master_time(master_time),.underrun(underrun),
 -      .rd_dat_i(rd1_dat), .rd_flags_i(rd_flags), .rd_ready_i(rd1_ready_o), .rd_ready_o(rd1_ready_i),
 +      .rd_dat_i(rd1_dat), .rd_flags_i(rd1_flags), .rd_ready_i(rd1_ready_o), .rd_ready_o(rd1_ready_i),
        .sample(sample_tx), .run(run_tx), .strobe(strobe_tx),
        .fifo_occupied(dsp_tx_occ),.fifo_full(dsp_tx_full),.fifo_empty(dsp_tx_empty),
        .debug(debug_txc) );
@@@ -587,7 -587,7 +587,7 @@@
  
     // ///////////////////////////////////////////////////////////////////////////////////
     // SERDES
- /*
+ 
     serdes #(.TXFIFOSIZE(9),.RXFIFOSIZE(9)) serdes
       (.clk(dsp_clk),.rst(dsp_rst),
        .ser_tx_clk(ser_tx_clk),.ser_t(ser_t),.ser_tklsb(ser_tklsb),.ser_tkmsb(ser_tkmsb),
@@@ -597,7 -597,7 +597,7 @@@
        .tx_occupied(ser_tx_occ),.tx_full(ser_tx_full),.tx_empty(ser_tx_empty),
        .rx_occupied(ser_rx_occ),.rx_full(ser_rx_full),.rx_empty(ser_rx_empty),
        .serdes_link_up(serdes_link_up),.debug0(debug_serdes0), .debug1(debug_serdes1) );
- */
+ 
     // ///////////////////////////////////////////////////////////////////////////////////
     // External RAM Interface