Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | get rid of redundant fifo18, since we can just use fifo19 and ignore the occ bit | Matt Ettus | 2010-06-06 | 1 | -40/+0 | |
| | | | | ||||||
| * | | | 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 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 | |||||
| * | | | | | 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 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | 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 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | 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 | |||||
| * | | | | | | | | 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 | |
| | | | | | | | | | ||||||
* | | | | | | | | | U2P: remember your semicolons. | Nick Foster | 2010-10-07 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | U2P: modified ICAP. turns out ICAP needs clock disabled while CE is not ↵ | Nick Foster | 2010-10-07 | 1 | -7/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | asserted. which is the point of a CE, but... it works. Also committed latest bootloader, might not be final version. | |||||
* | | | | | | | | | quad uart instead of single, for the extra on board serial ports | Matt Ettus | 2010-08-11 | 2 | -0/+72 | |
| | | | | | | | | | ||||||
* | | | | | | | | | proper selection of bank of ram for instruction, since the address | Matt Ettus | 2010-07-19 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has already incremented by the time the data is returned | |||||
* | | | | | | | | | reset the ack signal | Matt Ettus | 2010-07-13 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | attach the correct data port | Matt Ettus | 2010-07-13 | 1 | -5/+5 | |
| | | | | | | | | | ||||||
* | | | | | | | | | separate boot ram, redone memory map, connected uart | Matt Ettus | 2010-07-13 | 2 | -0/+247 | |
| | | | | | | | | | ||||||
* | | | | | | | | | ram_harvard2 is a workaround for a Xilinx bug that gets confused by an ↵ | Matt Ettus | 2010-07-12 | 2 | -0/+79 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unused write port on a ram | |||||
* | | | | | | | | | very slight mods from v5 version | Matt Ettus | 2010-07-12 | 1 | -0/+56 | |
| | | | | | | | | | ||||||
* | | | | | | | | | copied from quad radio | Matt Ettus | 2010-07-12 | 1 | -0/+54 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
* | | | | | | | | barely fails timing on gigE/10 and gigE/12, larger fail on udp/10, but all | Matt Ettus | 2010-06-14 | 3 | -212/+318 | |
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | seem to work ok | |||||
* | | | | | | | first attempt at cleaning up the build system | Matt Ettus | 2010-06-10 | 22 | -7528/+44 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | 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 | |||||
| * | | | | | 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 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | 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 | |
|\| | | | | ||||||
| * | | | | 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 branch 'corgan_fixes' into udp_corgan | Matt Ettus | 2010-04-26 | 1 | -1/+1 | |
|\| | | | | |_|_|/ |/| | | | ||||||
| * | | | 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 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'master' into udp | Matt Ettus | 2010-03-25 | 1 | -1/+1 | |
|\ \ \ | | |/ | |/| |