diff options
| author | Josh Blum <josh@joshknows.com> | 2010-12-10 13:49:56 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-12-10 13:49:56 -0800 |
| commit | 16530d02eb8088f6806cb146ceab2fea89c4ee0b (patch) | |
| tree | 67d17944c5b07ee0c6a91c0b9edadef8820769b2 /usrp2/top/u2_rev3/u2_rev3.v | |
| parent | 8c7d238c4fde0c3388aba2f91894076af6c5068a (diff) | |
| parent | c97440838aa740fc335c59914f6dfd6f492b69f8 (diff) | |
| download | uhd-16530d02eb8088f6806cb146ceab2fea89c4ee0b.tar.gz uhd-16530d02eb8088f6806cb146ceab2fea89c4ee0b.tar.bz2 uhd-16530d02eb8088f6806cb146ceab2fea89c4ee0b.zip | |
Merge branch 'ise12' into packet_router
Conflicts:
usrp2/top/u2_rev3/Makefile
usrp2/top/u2_rev3/u2_core.v
Diffstat (limited to 'usrp2/top/u2_rev3/u2_rev3.v')
| -rw-r--r-- | usrp2/top/u2_rev3/u2_rev3.v | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/usrp2/top/u2_rev3/u2_rev3.v b/usrp2/top/u2_rev3/u2_rev3.v index 4f7f9bf1a..f2bba6c50 100644 --- a/usrp2/top/u2_rev3/u2_rev3.v +++ b/usrp2/top/u2_rev3/u2_rev3.v @@ -11,10 +11,10 @@ module u2_rev3 input uart_rx_i, // Expansion - input exp_pps_in_p, // Diff - input exp_pps_in_n, // Diff - output exp_pps_out_p, // Diff - output exp_pps_out_n, // Diff + input exp_time_in_p, // Diff + input exp_time_in_n, // Diff + output exp_time_out_p, // Diff + output exp_time_out_n, // Diff // GMII // GMII-CTRL @@ -181,13 +181,13 @@ module u2_rev3 wire cpld_clock_buf; BUFG cpld_clock_BUF (.O(cpld_clock_buf),.I(cpld_clock)); - wire exp_pps_in; - IBUFDS exp_pps_in_pin (.O(exp_pps_in),.I(exp_pps_in_p),.IB(exp_pps_in_n)); - defparam exp_pps_in_pin.IOSTANDARD = "LVDS_25"; + wire exp_time_in; + IBUFDS exp_time_in_pin (.O(exp_time_in),.I(exp_time_in_p),.IB(exp_time_in_n)); + defparam exp_time_in_pin.IOSTANDARD = "LVDS_25"; - wire exp_pps_out; - OBUFDS exp_pps_out_pin (.O(exp_pps_out_p),.OB(exp_pps_out_n),.I(exp_pps_out)); - defparam exp_pps_out_pin.IOSTANDARD = "LVDS_25"; + wire exp_time_out; + OBUFDS exp_time_out_pin (.O(exp_time_out_p),.OB(exp_time_out_n),.I(exp_time_out)); + defparam exp_time_out_pin.IOSTANDARD = "LVDS_25"; reg [5:0] clock_ready_d; always @(posedge clk_fpga) @@ -480,8 +480,8 @@ module u2_rev3 .leds (leds_int), .debug (debug[31:0]), .debug_clk (debug_clk[1:0]), - .exp_pps_in (exp_pps_in), - .exp_pps_out (exp_pps_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]), |