diff options
| author | Josh Blum <josh@joshknows.com> | 2010-12-13 16:47:48 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-12-13 16:47:48 -0800 |
| commit | fd0c2dc1c53240afed5eba9e73a4b090cdcdf78a (patch) | |
| tree | 30e15ab4e2bde2175a9373234f634db9e7738d3d /fpga/usrp2/top/u2plus | |
| parent | e436016638b4d2b81d50ee2de98c271615eee806 (diff) | |
| parent | c97440838aa740fc335c59914f6dfd6f492b69f8 (diff) | |
| download | uhd-fd0c2dc1c53240afed5eba9e73a4b090cdcdf78a.tar.gz uhd-fd0c2dc1c53240afed5eba9e73a4b090cdcdf78a.tar.bz2 uhd-fd0c2dc1c53240afed5eba9e73a4b090cdcdf78a.zip | |
Merge branch 'fpga_ise12'
Diffstat (limited to 'fpga/usrp2/top/u2plus')
| -rw-r--r-- | fpga/usrp2/top/u2plus/u2plus.v | 4 | ||||
| -rw-r--r-- | fpga/usrp2/top/u2plus/u2plus_core.v | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/fpga/usrp2/top/u2plus/u2plus.v b/fpga/usrp2/top/u2plus/u2plus.v index 5facca298..c0140e989 100644 --- a/fpga/usrp2/top/u2plus/u2plus.v +++ b/fpga/usrp2/top/u2plus/u2plus.v @@ -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]), diff --git a/fpga/usrp2/top/u2plus/u2plus_core.v b/fpga/usrp2/top/u2plus/u2plus_core.v index 8426826e2..4e0b190ef 100644 --- a/fpga/usrp2/top/u2plus/u2plus_core.v +++ b/fpga/usrp2/top/u2plus/u2plus_core.v @@ -16,8 +16,8 @@ module u2plus_core output [1:0] debug_clk, // Expansion - input exp_pps_in, - output exp_pps_out, + input exp_time_in, + output exp_time_out, // GMII // GMII-CTRL @@ -683,7 +683,8 @@ module u2plus_core time_64bit #(.TICKS_PER_SEC(32'd100000000),.BASE(SR_TIME64)) time_64bit (.clk(dsp_clk), .rst(dsp_rst), .set_stb(set_stb_dsp), .set_addr(set_addr_dsp), .set_data(set_data_dsp), - .pps(pps_in), .vita_time(vita_time), .pps_int(pps_int)); + .pps(pps_in), .vita_time(vita_time), .pps_int(pps_int), + .exp_time_in(exp_time_in), .exp_time_out(exp_time_out)); // ///////////////////////////////////////////////////////////////////////////////////////// // Debug Pins |