summaryrefslogtreecommitdiffstats
path: root/fpga
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fpga_master' into uhd_nextJosh Blum2011-11-0727-372/+1342
|
* Merge branch 'fpga_master' into uhd_masterJosh Blum2011-10-122-2/+2
|
* Merge branch 'fpga_master' into uhd_masterJosh Blum2011-09-2821-52/+886
| | | | | 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-3126-990/+552
|
* Merge branch 'fpga_patch_release' into patch_releaseJosh Blum2011-08-297-29/+29
|
* Merge branch 'fpga_patch_release' into patch_releaserelease_003_002_002Josh Blum2011-08-158-16/+41
|
* Merge branch 'atr_fix_fpga' into atr_fixrelease_003_002_000Josh Blum2011-07-2813-563/+196
|
* fpga: squashed new_work fpga changes onto uhd nextJosh Blum2011-07-1934-4385/+150
|
* Merge branch 'fpga_next' into nextJosh Blum2011-07-081-1/+1
|
* Merge branch 'fpga_next' into nextJosh Blum2011-07-0847-768/+5325
|
* Merge branch 'fpga_next' into uhd_nextJosh Blum2011-06-14301-4201/+11113
|
* 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-0915-393/+763
|
* Merge branch 'master' into nextJosh Blum2011-04-192-2/+100
|\ | | | | | | | | Conflicts: fpga/usrp2/top/u2plus/Makefile.N200
| * usrp1: fix path to firmware files for fpga top levelJosh Blum2011-04-071-2/+2
| |
| * Merge branch 'fpga_master' into n200_supportJosh Blum2011-03-251-0/+98
| |
| * Merge branch 'fpga_master' into nextJosh Blum2011-03-172-16/+8
| |
* | Merge branch 'fpga_memory_reorg' into usrp2/new_reg_mapJosh Blum2011-03-1720-465/+561
|/
* usrp-e100: fpga fix removed missing directory from includeJosh Blum2011-03-101-1/+0
|
* Merge branch 'packet_router_2nd_dsp' into nextJosh Blum2011-03-1050-2153/+1096
|
* Merge branch 'packet_router_2nd_dsp' into usrp2_dual_dspJosh Blum2011-02-227-177/+275
|
* Merge branch 'fpga_next' into usrp_e100_develJosh Blum2011-02-082-29/+57
|
* Merge branch 'fpga_fix'Josh Blum2011-01-213-25/+114
|
* uhd: removed deleted fpga files removed from fpga repoJosh Blum2011-01-193-15/+0
|
* Merge branch 'fpga_next' into uhd_with_fpga_nextJosh Blum2011-01-1912-238/+403
|
* Merge branch 'fpga_next' into nextJosh Blum2010-12-294-165/+198
|
* Merge branch 'fpga_next' into uhd_nextJosh Blum2010-12-271-22/+13
|
* Merge branch 'fpga_next' into uhd_nextJosh Blum2010-12-2232-481/+3012
|
* Merge branch 'fpga_ise12'Josh Blum2010-12-1312-1160/+399
|
* Merge branch 'fpga_ise12'Josh Blum2010-12-093-4/+18
|
* Merge branch 'fpga_flow_control' into nextJosh Blum2010-11-231-1/+1
|
* uhd: added new hardware to readmeJosh Blum2010-11-231-1/+1
|
* Merge branch 'fpga_next' into nextJosh Blum2010-11-2365-878/+7961
|\ | | | | | | | | | | | | | | | | | | 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-23121-1085/+11263
| |
* | Merge branch 'usrp_e100' into nextJosh Blum2010-11-2364-215/+3325
|\ \ | |/ |/| | | | | Conflicts: images/Makefile
| * Merge branch 'ue1_rev2' into usrp_e_nextJosh Blum2010-10-2764-215/+3325
| |
* | Merge branch 'flow_control_fpga' into flow_ctrlJosh Blum2010-10-227-115/+304
| |
* | Merge branch 'flow_control' into flow_ctrlJosh Blum2010-10-1457-256/+10817
|/
* Merge branch 'ise12' into nextJosh Blum2010-08-313-29/+23
|
* Merge branch 'tx_policy' of ettus.sourcerepo.com:ettus/fpgapriv into premergeNick Foster2010-08-161-1/+1
|
* Merge branch 'features' into uhd_fpga_featuresJosh Blum2010-08-092-3/+6
|
* Merge branch 'features' into uhd_fpga_featuresJosh Blum2010-08-0923-5878/+873
| | | | | Conflicts: fpga/usrp2/vrt/vita_rx_control.v
* Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_fpga_mergeJosh Blum2010-07-051-4/+5
|
* 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-15268-901/+1835
| | | | | Conflicts: fpga/.gitignore
* Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpga into workJosh Blum2010-05-1822-2090/+554
|
* Merge branch 'shrinkfw' into usrp2Josh Blum2010-05-101-6/+18
|\
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 13:29:24 +0000