aboutsummaryrefslogtreecommitdiffstats
path: root/fpga
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fpga_next' into nextJosh Blum2012-07-194-4/+4
|
* Merge branch 'fpga_next' into nextJosh Blum2012-07-191-1/+8
|
* Merge branch 'fpga_next' into nextJosh Blum2012-07-1713-724/+219
|
* Merge branch 'master' into nextJosh Blum2012-07-163-43/+6
|\
| * Merge branch 'fpga_master'Josh Blum2012-07-163-43/+6
| |
| * Merge branch 'fpga_master'Josh Blum2012-07-0213-393/+4134
| |
* | Merge branch 'fpga_next' into nextJosh Blum2012-07-0223-1214/+4958
|/
* Merge branch 'fpga_master'Josh Blum2012-05-221-1/+38
|
* Merge branch 'fpga_master'Josh Blum2012-05-102-7/+9
|
* Merge branch 'fpga_master'Josh Blum2012-04-2512-922/+29
|
* Merge branch 'timed_cmds_work_fpga' into timed_cmds_workJosh Blum2012-04-216-416/+429
|
* Merge branch 'fpga_next' into nextJosh Blum2012-04-104-3/+63
|
* Merge branch 'master' into nextJosh Blum2012-04-032-5/+5
|\ | | | | | | | | Conflicts: host/examples/CMakeLists.txt
| * Merge branch 'fpga_maint' into maintJosh Blum2012-04-022-5/+5
| |
* | Merge branch 'master' into nextJosh Blum2012-03-264-85/+92
|\|
| * Merge branch 'fpga_maint' into maintJosh Blum2012-03-264-85/+92
| |
* | Merge branch 'fpga_next' into nextJosh Blum2012-03-2312-426/+1454
|/
* Merge branch 'fpga_master'Josh Blum2012-03-129-13/+16
|
* Merge branch 'fpga_master'Josh Blum2012-03-114-101/+3
|
* Merge branch 'fpga_master'Josh Blum2012-02-183-4/+26
|
* Merge branch 'fpga_next' into nextJosh Blum2012-02-1754-1070/+2565
|
* uhd: added/renamed various readme filesJosh Blum2012-02-041-4/+0
|
* 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-116-8/+8
|
* 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
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 08:24:32 +0000