diff options
| author | Josh Blum <josh@joshknows.com> | 2010-12-12 17:54:04 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-12-12 17:54:04 -0800 |
| commit | ab9edbfbcb065b3ec380992b3b5836833ce92b4b (patch) | |
| tree | dc8be06a67a75e8d9b713c62841104e1f619964b /usrp2/top/u2plus/u2plus.v | |
| parent | b6b5b7b65dca848322941c2df73d1b9f5b6ac907 (diff) | |
| parent | 6c1d4ebdbd2229654976dd672a5433c300dc0d17 (diff) | |
| download | uhd-ab9edbfbcb065b3ec380992b3b5836833ce92b4b.tar.gz uhd-ab9edbfbcb065b3ec380992b3b5836833ce92b4b.tar.bz2 uhd-ab9edbfbcb065b3ec380992b3b5836833ce92b4b.zip | |
Merge branch 'packet_router' into zpu
Conflicts:
usrp2/top/u2_rev3/u2_core.v
Diffstat (limited to 'usrp2/top/u2plus/u2plus.v')
| -rw-r--r-- | usrp2/top/u2plus/u2plus.v | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usrp2/top/u2plus/u2plus.v b/usrp2/top/u2plus/u2plus.v index 270655a8d..c0140e989 100644 --- a/usrp2/top/u2plus/u2plus.v +++ b/usrp2/top/u2plus/u2plus.v @@ -44,7 +44,7 @@ module u2plus output [1:0] clk_en, output [1:0] clk_sel, input CLK_FUNC, // FIXME is an input to control the 9510 - input CLK_STATUS, + input clk_status, inout SCL, inout SDA, // I2C @@ -357,8 +357,8 @@ module u2plus .leds (leds_int), .debug (debug[31:0]), .debug_clk (debug_clk[1:0]), - .exp_pps_in (exp_time_in), - .exp_pps_out (exp_time_out), + .exp_time_in (exp_time_in), + .exp_time_out (exp_time_out), .GMII_COL (GMII_COL), .GMII_CRS (GMII_CRS), .GMII_TXD (GMII_TXD_unreg[7:0]), |