Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ise12_exp' into u1e | Matt Ettus | 2010-06-01 | 2 | -212/+317 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * ise12_exp: zero out debug pins. helps timing a little bit. non-udp uses a different address for the tx dsp core manual merge to use localparams from udp version from UDP branch, changed names because I want these separate from the non-udp versions ignore output files new files from udp branch added to main Makefile change the debug pins, which makes it more reliable. This is unnerving. experimental mods to make ram loader fully synchronous. Based on IJB's work fixes from IJB from 5/24. Basically connect unconnected wires. removes the icache and pipelines the reads | ||||
| * | Merge branch 'new_ramloader' into nocache_plus_newramloader, plus manual ↵ | Matt Ettus | 2010-05-28 | 2 | -220/+252 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge into udp version. Raw ethernet, ISE 10 -- Passes timing, works UDP, ISE 10 -- barely fails timing, works ISE 12 -- both fail timing, not tested yet. * new_ramloader: experimental mods to make ram loader fully synchronous. Based on IJB's work | ||||
| | * | experimental mods to make ram loader fully synchronous. Based on IJB's work | Matt Ettus | 2010-05-26 | 2 | -220/+252 |
| | | | |||||
| * | | Merge branch 'master_nocache' into master_nocache_post_merge | Matt Ettus | 2010-05-28 | 1 | -0/+73 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems to work on raw ethernet version which was automatically merged UDP version untested, and the following files were merged manually: u2_core_udp.v Makefile.udp * master_nocache: change the debug pins, which makes it more reliable. This is unnerving. fixes from IJB from 5/24. Basically connect unconnected wires. removes the icache and pipelines the reads | ||||
| | * | fixes from IJB from 5/24. Basically connect unconnected wires. | Matt Ettus | 2010-05-24 | 1 | -0/+2 |
| | | | |||||
| | * | removes the icache and pipelines the reads | Matt Ettus | 2010-05-20 | 1 | -0/+71 |
| | | | |||||
| * | | Merge branch 'master' into udp | Matt Ettus | 2010-05-18 | 1 | -2/+4 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Remove CVS files, warning removal on setting reg width, aeMB synthesis pragmas Conflicts: usrp2/control_lib/setting_reg.v usrp2/top/u2_core/u2_core.v usrp2/top/u2_rev3/Makefile | ||||
| * | | reverting logic clean up which should have made timing better, but made it ↵ | Matt Ettus | 2010-05-11 | 1 | -5/+12 |
| | | | | | | | | | | | | worse instead | ||||
| * | | Merge branch 'master' into udp | Matt Ettus | 2010-05-11 | 2 | -13/+25 |
| |\ \ | |||||
| * \ \ | Merge branch 'corgan_fixes' into udp_corgan | Matt Ettus | 2010-04-26 | 1 | -1/+1 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'master' into u1e_merge_with_master | Matt Ettus | 2010-05-27 | 1 | -2/+4 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: get rid of some warnings by declaring setting reg width added width parameter to avoid warnings (thanks IJB) and default value parameter added pragmas suggested by Ian Buckley to help ISE12 synthesis get rid of old CVS linkage settings bus to dsp_clk now uses clock crossing fifo remove files for old prototypes, they were confusing people revert commit 9899b81f920 which should have improved timing but didn't Conflicts: usrp2/control_lib/setting_reg.v usrp2/top/u2_core/u2_core.v usrp2/top/u2_rev3/Makefile | ||||
| * | | | | added width parameter to avoid warnings (thanks IJB) and default value parameter | Matt Ettus | 2010-05-18 | 1 | -3/+5 |
| | | | | | |||||
| * | | | | revert commit 9899b81f920 which should have improved timing but didn't | Matt Ettus | 2010-05-13 | 1 | -5/+13 |
| | |_|/ | |/| | | |||||
* | | | | test full width packets | Matt Ettus | 2010-05-24 | 1 | -0/+27 |
| | | | | |||||
* | | | | fifo36_to_ll8 and fifo pacer need a real fifo between them or they deadlock ↵ | Matt Ettus | 2010-05-21 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | (by design) | ||||
* | | | | fix double declaration | Matt Ettus | 2010-05-21 | 1 | -1/+0 |
| | | | | |||||
* | | | | send bigger packets to reduce cpu load | Matt Ettus | 2010-05-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | combined timed and crc cases. fifo pacer produces/consumes at a fixed rate | Matt Ettus | 2010-05-20 | 1 | -0/+24 |
| | | | | |||||
* | | | | moved fifos into gpmc_async, reorganized top level a bit, added in crc ↵ | Matt Ettus | 2010-05-12 | 3 | -6/+48 |
| | | | | | | | | | | | | | | | | packet gen and test | ||||
* | | | | add missing signal from sensitivity list | Matt Ettus | 2010-05-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into u1e | Matt Ettus | 2010-05-12 | 3 | -14/+26 |
|\| | | | |||||
| * | | | cleaned up the logic, this is copied over from quad radio | Matt Ettus | 2010-05-11 | 1 | -13/+5 |
| | | | | |||||
| * | | | allow settings bus to cross to a new clock domain, should help timing, but ↵ | Matt Ettus | 2010-05-11 | 1 | -0/+20 |
| | |/ | |/| | | | | | | | not attached yet | ||||
| * | | Merge commit 'upstream/master' | Johnathan Corgan | 2010-03-09 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | Fix missing item on sensitivity list | Johnathan Corgan | 2010-02-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | packet generator and verifier, to test gpmc and other data transfer stuff | Matt Ettus | 2010-05-12 | 4 | -0/+153 |
| | | | | |||||
* | | | | added 16-bit wide atr controller | Matt Ettus | 2010-04-01 | 3 | -14/+73 |
| | | | | | | | | | | | | | | | | | | | | settings_bus_16 now handles variable address window sizes split ctrl of nsgpio into ctrl (selector) and debug bits | ||||
* | | | | Merge branch 'udp' into u1e | Matt Ettus | 2010-03-25 | 3 | -50/+51 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'master' into udp | Matt Ettus | 2010-03-25 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| * / | | moved into subdir | Josh Blum | 2010-01-22 | 76 | -0/+11383 |
| / / | |||||
* | | | enable was on the wrong address pin, needs to be the highest order one | Matt Ettus | 2010-02-25 | 1 | -2/+2 |
| | | | |||||
* | | | Switched xilinx primitives because they order the bits funny in the other one | Matt Ettus | 2010-02-25 | 1 | -48/+79 |
| | | | |||||
* | | | ISE chokes on the pure verilog version so we use the macro | Matt Ettus | 2010-02-25 | 1 | -4/+49 |
| | | | |||||
* | | | Merge branch 'master' into u1e | Matt Ettus | 2010-02-23 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | Conflicts: .gitignore | ||||
| * | | proper initialization of the ram | Matt Ettus | 2010-02-23 | 1 | -1/+1 |
| |/ | |||||
* | | first cut at making a bidirectional 2 port ram for the gpmc data interface | Matt Ettus | 2010-02-23 | 1 | -0/+44 |
| | | | | | | | | ISE chokes on the unequal size ram | ||||
* | | settings bus with 16 bit wishbone interface, put on the main wishbone in u1e | Matt Ettus | 2010-02-22 | 1 | -0/+54 |
| | | |||||
* | | Modified nsgpio.v to support 16 bit little endian bus interface. | Matt Ettus | 2010-02-22 | 1 | -0/+124 |
| | | |||||
* | | allow default uart clock divider | Matt Ettus | 2010-02-18 | 1 | -6/+7 |
|/ | |||||
* | Moved usrp2 fpga files into usrp2 subdir. | Josh Blum | 2010-01-22 | 76 | -0/+11382 |