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/u2plus | |
| 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/u2plus')
| -rwxr-xr-x | usrp2/top/u2plus/u2plus.ucf | 2 | ||||
| -rw-r--r-- | usrp2/top/u2plus/u2plus.v | 6 | ||||
| -rw-r--r-- | usrp2/top/u2plus/u2plus_core.v | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/usrp2/top/u2plus/u2plus.ucf b/usrp2/top/u2plus/u2plus.ucf index 25267a67e..5fbe55c26 100755 --- a/usrp2/top/u2plus/u2plus.ucf +++ b/usrp2/top/u2plus/u2plus.ucf @@ -158,7 +158,7 @@ NET "RXD<2>" LOC = "AF15" ; NET "RXD<1>" LOC = "AD12" ; ## AD9510 -NET "CLK_STATUS" LOC = "AD22" ; +NET "clk_status" LOC = "AD22" ; NET "CLK_FUNC" LOC = "AC21" ; NET "clk_sel<0>" LOC = "AE21" ; NET "clk_sel<1>" LOC = "AD21" ; 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]), diff --git a/usrp2/top/u2plus/u2plus_core.v b/usrp2/top/u2plus/u2plus_core.v index 8426826e2..4e0b190ef 100644 --- a/usrp2/top/u2plus/u2plus_core.v +++ b/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 |