aboutsummaryrefslogtreecommitdiffstats
path: root/fpga/usrp2/coregen
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fpga_next' into nextJosh Blum2012-03-231-3/+1
|
* fpga: squashed new_work fpga changes onto uhd nextJosh Blum2011-07-1912-4177/+3
|
* Merge branch 'fpga_next' into nextJosh Blum2011-07-0812-3/+4177
|
* uhd: removed deleted fpga files removed from fpga repoJosh Blum2011-01-193-15/+0
|
* uhd: added new hardware to readmeJosh Blum2010-11-231-1/+1
|
* Merge branch 'fpga_next' into nextJosh Blum2010-11-2324-3/+4765
|\ | | | | | | | | | | | | | | | | | | Conflicts: fpga/usrp2/top/u1e_passthru/.gitignore fpga/usrp2/top/u1e_passthru/Makefile fpga/usrp2/top/u2plus/.gitignore fpga/usrp2/top/u2plus/Makefile usrp2/top/u1e_passthru/.gitignore usrp2/top/u1e_passthru/Makefile
| * fpga: performed a forceful checkout of fpga to overwrite with current fpga codeJosh Blum2010-11-2321-3/+4750
|/
* Merge branch 'flow_control' into flow_ctrlJosh Blum2010-10-1421-10/+1094
|
* Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_masterJosh Blum2010-06-151-0/+19
| | | | | Conflicts: fpga/.gitignore
* Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpga into workJosh Blum2010-05-188-0/+514
|
* moved usrp1 and usrp2 fpga dirs into fpga subdirectoryJosh Blum2010-04-1548-0/+3055