aboutsummaryrefslogtreecommitdiffstats
path: root/fpga/usrp2/top
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fpga_master'Josh Blum2012-01-111-377/+377
|
* Merge branch 'fpga_master' into uhd_masterJosh Blum2011-11-292-4/+4
|
* Merge branch 'fpga_cal_work' into calibrationJosh Blum2011-11-114-4/+4
|
* Merge branch 'fpga_master' into uhd_nextJosh Blum2011-11-076-273/+182
|
* Merge branch 'fpga_master' into uhd_masterJosh Blum2011-10-122-2/+2
|
* Merge branch 'fpga_master' into uhd_masterJosh Blum2011-09-289-32/+493
| | | | | Conflicts: fpga/usrp1/toplevel/usrp_std/usrp_std.v
* Merge branch 'fpga_master' into e110_supportJosh Blum2011-09-021-10/+10
|
* Merge branch 'fpga_master'Josh Blum2011-09-012-1/+102
|
* Merge branch 'fpga_master' into nextJosh Blum2011-08-316-45/+29
|
* Merge branch 'fpga_patch_release' into patch_releaseJosh Blum2011-08-292-2/+2
|
* Merge branch 'fpga_patch_release' into patch_releaserelease_003_002_002Josh Blum2011-08-156-11/+36
|
* Merge branch 'atr_fix_fpga' into atr_fixrelease_003_002_000Josh Blum2011-07-282-28/+28
|
* fpga: squashed new_work fpga changes onto uhd nextJosh Blum2011-07-1911-5/+45
|
* Merge branch 'fpga_next' into nextJosh Blum2011-07-081-1/+1
|
* Merge branch 'fpga_next' into nextJosh Blum2011-07-089-261/+310
|
* Merge branch 'fpga_next' into uhd_nextJosh Blum2011-06-1467-4367/+1227
|
* Merge branch 'fpga_next' into uhd_masterJosh Blum2011-05-231-1/+4
|
* Merge branch 'next' into use_vita_lengthJosh Blum2011-05-161-1/+1
|
* Merge branch 'next' into use_vita_lengthJosh Blum2011-05-094-257/+507
|
* Merge branch 'master' into nextJosh Blum2011-04-191-0/+98
|\ | | | | | | | | Conflicts: fpga/usrp2/top/u2plus/Makefile.N200
| * Merge branch 'fpga_master' into n200_supportJosh Blum2011-03-251-0/+98
| |
| * Merge branch 'fpga_master' into nextJosh Blum2011-03-171-1/+0
| |
* | Merge branch 'fpga_memory_reorg' into usrp2/new_reg_mapJosh Blum2011-03-174-274/+267
|/
* usrp-e100: fpga fix removed missing directory from includeJosh Blum2011-03-101-1/+0
|
* Merge branch 'packet_router_2nd_dsp' into nextJosh Blum2011-03-109-204/+41
|
* Merge branch 'packet_router_2nd_dsp' into usrp2_dual_dspJosh Blum2011-02-223-160/+205
|
* Merge branch 'fpga_next' into usrp_e100_develJosh Blum2011-02-081-29/+52
|
* Merge branch 'fpga_next' into uhd_with_fpga_nextJosh Blum2011-01-194-208/+255
|
* Merge branch 'fpga_next' into uhd_nextJosh Blum2010-12-224-414/+424
|
* Merge branch 'fpga_ise12'Josh Blum2010-12-138-1085/+208
|
* Merge branch 'fpga_ise12'Josh Blum2010-12-092-2/+2
|
* fpga: performed a forceful checkout of fpga to overwrite with current fpga codeJosh Blum2010-11-2335-691/+3826
|
* Merge branch 'flow_control_fpga' into flow_ctrlJosh Blum2010-10-221-43/+43
|
* Merge branch 'flow_control' into flow_ctrlJosh Blum2010-10-146-182/+379
|
* Merge branch 'ise12' into nextJosh Blum2010-08-312-7/+10
|
* Merge branch 'features' into uhd_fpga_featuresJosh Blum2010-08-092-3/+6
|
* Merge branch 'features' into uhd_fpga_featuresJosh Blum2010-08-092-87/+82
| | | | | Conflicts: fpga/usrp2/vrt/vita_rx_control.v
* Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_fpga_mergeJosh Blum2010-06-241-1/+2
|
* Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_masterJosh Blum2010-06-158-404/+1137
| | | | | Conflicts: fpga/.gitignore
* Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpga into workJosh Blum2010-05-1812-2089/+20
|
* Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpgaprivJosh Blum2010-05-103-4/+15
|
* moved usrp1 and usrp2 fpga dirs into fpga subdirectoryJosh Blum2010-04-1541-0/+8397
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 10:42:09 +0000