diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-08-01 18:49:22 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-08-01 18:49:22 -0700 |
| commit | 3df0f6e9e4b2784c7c23a566a34391b9629d32c1 (patch) | |
| tree | 3b050febb23a25ea5279b21628684b1ff92ee970 /host/docs | |
| parent | 031839052be29825e4d28b341dfc98abc9d1a903 (diff) | |
| parent | 4503c7e6287e4204af946c9aa6e669f76c9b8289 (diff) | |
| download | uhd-3df0f6e9e4b2784c7c23a566a34391b9629d32c1.tar.gz uhd-3df0f6e9e4b2784c7c23a566a34391b9629d32c1.tar.bz2 uhd-3df0f6e9e4b2784c7c23a566a34391b9629d32c1.zip | |
Merge branch 'maint'
Conflicts:
host/lib/usrp/dboard/db_wbx_version2.cpp
host/lib/usrp/dboard/db_wbx_version3.cpp
Diffstat (limited to 'host/docs')
| -rw-r--r-- | host/docs/calibration.dox | 1 | ||||
| -rw-r--r-- | host/docs/usrp_e3x0.dox | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/host/docs/calibration.dox b/host/docs/calibration.dox index 02ad41699..b4454aa24 100644 --- a/host/docs/calibration.dox +++ b/host/docs/calibration.dox @@ -33,6 +33,7 @@ utilities: - WBX Series transceiver boards - SBX Series transceiver boards - CBX Series transceiver boards +- UBX Series transceiver boards \subsection calibration_self_utils Calibration Utilities diff --git a/host/docs/usrp_e3x0.dox b/host/docs/usrp_e3x0.dox index 1a94e6c7e..fdaea80e2 100644 --- a/host/docs/usrp_e3x0.dox +++ b/host/docs/usrp_e3x0.dox @@ -135,7 +135,7 @@ have custom UHD modifications. -# Setup your environment as described in \ref e3x0_sdk_usage -# Type the following in the build directory (assuming a build in host/build): - $ cmake -DCMAKE_TOOLCHAIN_FILE=../host/cmake/Toolchains/oe-sdk_cross.cmake -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_E300=ON .. + $ cmake -DCMAKE_TOOLCHAIN_FILE=../host/cmake/Toolchains/oe-sdk_cross.cmake -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_E300=ON -DENABLE_GPSD=ON .. $ make For instructions on building UHD on a PC to interact with your E-Series device, follow these instructions: \ref e3x0_uhd_build |