diff options
author | Michael West <michael.west@ettus.com> | 2013-12-06 17:47:24 -0800 |
---|---|---|
committer | Michael West <michael.west@ettus.com> | 2013-12-06 17:47:24 -0800 |
commit | c3aa7326095a1a8c744e269a04572de74600df8d (patch) | |
tree | 983711ae9718128617b5f1880f8c6399e38e4055 /firmware/README.txt | |
parent | aa3d9a9da0405e84e720870a13718b177d85652c (diff) | |
parent | 8f0f045cdac16ae84bc446b230beb2b651428294 (diff) | |
download | uhd-c3aa7326095a1a8c744e269a04572de74600df8d.tar.gz uhd-c3aa7326095a1a8c744e269a04572de74600df8d.tar.bz2 uhd-c3aa7326095a1a8c744e269a04572de74600df8d.zip |
Merge branch 'master' into mwest_coverity
Conflicts:
host/lib/usrp/b200/b200_iface.cpp
Diffstat (limited to 'firmware/README.txt')
-rw-r--r-- | firmware/README.txt | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/firmware/README.txt b/firmware/README.txt deleted file mode 100644 index 1c233de1d..000000000 --- a/firmware/README.txt +++ /dev/null @@ -1,31 +0,0 @@ -######################################################################## -# Firmware for USRP devices -######################################################################## - -fx2/ - - Description: firmware for FX2 device - - Devices: USRP1 and B100 - - Tools: sdcc, cmake - - Build Instructions: - 1) mkdir <build directory> - 2) cd <build directory> - 3) cmake <source directory> - 4) make - -zpu/ - - Description: firmware for soft CPU in FPGA - - Devices: USRP2 and N Series - - Tools: zpu-gcc, cmake - - Build Instructions: - 1) mkdir <build directory> - 2) cd <build directory> - 3) cmake <source directory> - 4) make |