Merge branch 'packet_router' into next

1 files changed, 3 insertions, 18 deletions

diff --git a/firmware/microblaze/lib/u2_init.c b/firmware/microblaze/lib/u2_init.c
index 4a553a713..191a0e816 100644
--- a/firmware/microblaze/lib/u2_init.c
+++ b/firmware/microblaze/lib/u2_init.c
@@ -20,25 +20,13 @@
 #include "spi.h"
 #include "pic.h"
 #include "hal_io.h"
-#include "buffer_pool.h"
 #include "hal_uart.h"
 #include "i2c.h"
-#include "i2c_async.h"
 #include "mdelay.h"
 #include "clocks.h"
 #include "usrp2/fw_common.h"
 #include "nonstdio.h"
 
-unsigned char u2_hw_rev_major;
-unsigned char u2_hw_rev_minor;
-
-static inline void
-get_hw_rev(void)
-{
-  bool ok = eeprom_read(USRP2_I2C_ADDR_MBOARD, USRP2_EE_MBOARD_REV, &u2_hw_rev_minor, 1);
-  ok &= eeprom_read(USRP2_I2C_ADDR_MBOARD, USRP2_EE_MBOARD_REV+1, &u2_hw_rev_major, 1);
-}
-
 /*
  * We ought to arrange for this to be called before main, but for now,
  * we require that the user's main call u2_init as the first thing...
@@ -60,13 +48,8 @@ u2_init(void)
   // init i2c so we can read our rev
   pic_init();	// progammable interrupt controller
   i2c_init();
-  i2c_register_handler(); //for using async I2C
   hal_enable_ints();
 
-  bp_init();	// buffer pool
-  
-
-
   // flash all leds to let us know board is alive
   hal_set_leds(0x0, 0x1f);
   mdelay(100);
@@ -85,6 +68,8 @@ u2_init(void)
     printf("ad9510 reg[0x%x] = 0x%x\n", rr, vv);
   }
 #endif
-  
+
+  output_regs->serdes_ctrl = (SERDES_ENABLE | SERDES_RXEN);
+
   return true;
 }