diff options
| author | Josh Blum <josh@joshknows.com> | 2011-09-28 13:27:33 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-09-28 13:27:33 -0700 |
| commit | 4226748ddda610eafaf5c6c32be206c336232b80 (patch) | |
| tree | 93795f42993ba85ffe4b1d4b539bc72eccd638d5 /fpga/usrp2/top/E1x0/u1e.ucf | |
| parent | c2122833e25ffe6e8e6918874afe7a3c9a92bc87 (diff) | |
| parent | 24b07e1b0dbe8ab9d72c46f65c14c34e84347554 (diff) | |
| download | uhd-4226748ddda610eafaf5c6c32be206c336232b80.tar.gz uhd-4226748ddda610eafaf5c6c32be206c336232b80.tar.bz2 uhd-4226748ddda610eafaf5c6c32be206c336232b80.zip | |
Merge branch 'fpga_master' into uhd_master
Conflicts:
fpga/usrp1/toplevel/usrp_std/usrp_std.v
Diffstat (limited to 'fpga/usrp2/top/E1x0/u1e.ucf')
| -rw-r--r-- | fpga/usrp2/top/E1x0/u1e.ucf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fpga/usrp2/top/E1x0/u1e.ucf b/fpga/usrp2/top/E1x0/u1e.ucf index 0c487a601..278fc289a 100644 --- a/fpga/usrp2/top/E1x0/u1e.ucf +++ b/fpga/usrp2/top/E1x0/u1e.ucf @@ -67,8 +67,10 @@ NET "overo_gpio170" LOC = "E8" ; # MISC GPIO for debug NET "overo_gpio176" LOC = "B4" ; # MISC GPIO for debug ## Overo UART -#NET "overo_txd1" LOC = "C6" ; -#NET "overo_rxd1" LOC = "D6" ; +NET "overo_txd1" LOC = "C6" ; +NET "overo_rxd1" LOC = "D6" ; +NET "fpga_txd1" LOC = "AB9" ; +NET "fpga_rxd1" LOC = "AB8" ; ## FTDI UART to USB converter NET "FPGA_TXD" LOC = "G19" ; |