diff options
| author | Josh Blum <josh@joshknows.com> | 2010-12-09 15:23:16 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-12-09 15:23:16 -0800 |
| commit | cedb517a70a81fb9604e8f08c8aed681ce70dbbb (patch) | |
| tree | a8bda1b4e68fdceb471936303858cc1d73b183f5 /fpga/usrp2/top | |
| parent | 0e693a62a89dc705c708cf50a8e5debec382e91f (diff) | |
| parent | 0abb502d9e9aefc33ead200002906f70b7c982d5 (diff) | |
| download | uhd-cedb517a70a81fb9604e8f08c8aed681ce70dbbb.tar.gz uhd-cedb517a70a81fb9604e8f08c8aed681ce70dbbb.tar.bz2 uhd-cedb517a70a81fb9604e8f08c8aed681ce70dbbb.zip | |
Merge branch 'fpga_ise12'
Diffstat (limited to 'fpga/usrp2/top')
| -rwxr-xr-x | fpga/usrp2/top/u2plus/u2plus.ucf | 2 | ||||
| -rw-r--r-- | fpga/usrp2/top/u2plus/u2plus.v | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fpga/usrp2/top/u2plus/u2plus.ucf b/fpga/usrp2/top/u2plus/u2plus.ucf index 25267a67e..5fbe55c26 100755 --- a/fpga/usrp2/top/u2plus/u2plus.ucf +++ b/fpga/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/fpga/usrp2/top/u2plus/u2plus.v b/fpga/usrp2/top/u2plus/u2plus.v index 270655a8d..5facca298 100644 --- a/fpga/usrp2/top/u2plus/u2plus.v +++ b/fpga/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 |