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/u2plus.ucf | |
| 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/u2plus.ucf')
| -rwxr-xr-x | usrp2/top/u2plus/u2plus.ucf | 2 |
1 files changed, 1 insertions, 1 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" ; |