Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into usrp2p | Nick Foster | 2010-08-10 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this was the merge from hell Conflicts: firmware/microblaze/Makefile.am firmware/microblaze/bootstrap firmware/microblaze/configure.ac firmware/microblaze/lib/Makefile.inc host/lib/CMakeLists.txt host/lib/usrp/mimo_usrp.cpp host/lib/usrp/simple_usrp.cpp host/lib/usrp/usrp2/clock_ctrl.cpp host/lib/usrp/usrp2/codec_impl.cpp host/lib/usrp/usrp2/dboard_impl.cpp host/lib/usrp/usrp2/mboard_impl.cpp host/lib/usrp/usrp2/usrp2_iface.hpp host/lib/usrp/usrp2/usrp2_impl.hpp host/lib/usrp/usrp2/usrp2_regs.hpp host/test/CMakeLists.txt | ||||
| * | usrp2: reorganized firmware directory | Josh Blum | 2010-07-30 | 1 | -3/+2 |
| | | |||||
* | | New branch with firmware dir from USRP2P branch. | Nick Foster | 2010-07-26 | 1 | -3/+4 |
|/ | |||||
* | Restored microblaze build (accidentally removed makefile ams and gitignores ↵ | Josh Blum | 2010-02-16 | 1 | -0/+27 |
| | | | | when doing cmake for host) | ||||
* | Removed Autotools stuff and the git ignore files. | Josh Blum | 2010-02-15 | 1 | -27/+0 |
| | | | | | Feeding cpack a readme and license file. Added readme contents. | ||||
* | removed dboard files | Josh Blum | 2010-02-10 | 1 | -0/+1 |
| | |||||
* | Copied a snapshot of the usrp2 firmware into the microblaze firmware ↵ | Josh Blum | 2010-02-10 | 1 | -0/+26 |
directory in the uhd repo. Added erllc copyrights to the files created and modified at erllc. |